summaryrefslogtreecommitdiff
path: root/drivers/mtd/spi
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-12-12 19:36:12 +0530
committerSimon Glass <sjg@chromium.org>2014-12-13 15:08:04 -0700
commitb648742a17c16639976ac5b38f246cb0f7d41da5 (patch)
tree35306ae878632d24c4e68ee2d034e596757e2a16 /drivers/mtd/spi
parent6dd6e90e13acc4014634d78fc469e7e82eefc255 (diff)
downloadu-boot-imx-b648742a17c16639976ac5b38f246cb0f7d41da5.zip
u-boot-imx-b648742a17c16639976ac5b38f246cb0f7d41da5.tar.gz
u-boot-imx-b648742a17c16639976ac5b38f246cb0f7d41da5.tar.bz2
spi: Fix flag collision for SST_WP
At present SECT_4K is the same as SST_WP so we cannot tell these apart. Fix this so that the table in sf_params.c can be used correctly. Reported-by: Jens Rottmann <Jens.Rottmann@adlinktech.com> Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
Diffstat (limited to 'drivers/mtd/spi')
-rw-r--r--drivers/mtd/spi/sf_internal.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h
index e159f04..7218e69 100644
--- a/drivers/mtd/spi/sf_internal.h
+++ b/drivers/mtd/spi/sf_internal.h
@@ -41,6 +41,7 @@ enum {
SECT_32K = 1 << 1,
E_FSR = 1 << 2,
WR_QPP = 1 << 3,
+ SST_WP = 1 << 4,
};
#define SPI_FLASH_3B_ADDR_LEN 3
@@ -104,7 +105,6 @@ enum {
/* SST specific */
#ifdef CONFIG_SPI_FLASH_SST
-# define SST_WP 0x01 /* Supports AAI word program */
# define CMD_SST_BP 0x02 /* Byte Program */
# define CMD_SST_AAI_WP 0xAD /* Auto Address Incr Word Program */