From: Jagan Teki <jteki@openedev.com>
Date: Wed, 25 Nov 2015 19:33:33 +0000 (+0530)
Subject: sf: Remove unneeded SST_BP and SST_WP
X-Git-Tag: v2016.01-rc3~34^2~6
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=aae00f8bab3af6d353c254d420c069018fd4ffa6;p=oweals%2Fu-boot.git

sf: Remove unneeded SST_BP and SST_WP

SST parts added on sf_params.c supports both SST_WR which consits
of both BP and WP and there is a spi controller ich which supports
only BP so the relevent _write hook set based on "slave->op_mode_tx"
hence there is no respective change required from flash side hance
removed these.

Tested-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Jagan Teki <jteki@openedev.com>
---

diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h
index b8692c6147..16dd45bfc6 100644
--- a/drivers/mtd/spi/sf_internal.h
+++ b/drivers/mtd/spi/sf_internal.h
@@ -44,13 +44,10 @@ enum {
 #endif
 	SECT_32K	= 1 << 1,
 	E_FSR		= 1 << 2,
-	SST_BP		= 1 << 3,
-	SST_WP		= 1 << 4,
-	WR_QPP		= 1 << 5,
+	SST_WR		= 1 << 3,
+	WR_QPP		= 1 << 4,
 };
 
-#define SST_WR		(SST_BP | SST_WP)
-
 enum spi_nor_option_flags {
 	SNOR_F_SST_WR		= (1 << 0),
 	SNOR_F_USE_FSR		= (1 << 1),