From b648742a17c16639976ac5b38f246cb0f7d41da5 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 12 Dec 2014 19:36:12 +0530 Subject: [PATCH] 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 Signed-off-by: Simon Glass Reviewed-by: Jagannadha Sutradharudu Teki --- drivers/mtd/spi/sf_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h index e159f04000..7218e697a0 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 */ -- 2.25.1