mtd: spi-nor-core: Rename configuration macro for S28 support

Change configuration macro name to support all other devices in SEMPER S28
family.

Signed-off-by: Takahiro Kuwano <Takahiro.Kuwano@infineon.com>
Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>

diff --git a/configs/j721s2_evm_a72_defconfig b/configs/j721s2_evm_a72_defconfig
index 9fe30066899f53cb6fc1edcab791fced14ed5276..2b2f80c4aaa6b95c117e73d6e18f6069577456f4 100644 (file)
--- a/configs/j721s2_evm_a72_defconfig
+++ b/configs/j721s2_evm_a72_defconfig
@@ -149,7 +149,7 @@ CONFIG_SPI_FLASH_SFDP_SUPPORT=y
 CONFIG_SPI_FLASH_SOFT_RESET=y
 CONFIG_SPI_FLASH_SOFT_RESET_ON_BOOT=y
 CONFIG_SPI_FLASH_SPANSION=y
-CONFIG_SPI_FLASH_S28HS512T=y
+CONFIG_SPI_FLASH_S28HX_T=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_MT35XU=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set

diff --git a/configs/j721s2_evm_r5_defconfig b/configs/j721s2_evm_r5_defconfig
index f74333f27cbd904376cc3ad64682a2158c72f9ce..2de5d87bdb29b0910db8375356daa0efad36ceee 100644 (file)
--- a/configs/j721s2_evm_r5_defconfig
+++ b/configs/j721s2_evm_r5_defconfig
@@ -128,7 +128,7 @@ CONFIG_SPI_FLASH_SFDP_SUPPORT=y
 CONFIG_SPI_FLASH_SOFT_RESET=y
 CONFIG_SPI_FLASH_SOFT_RESET_ON_BOOT=y
 CONFIG_SPI_FLASH_SPANSION=y
-CONFIG_SPI_FLASH_S28HS512T=y
+CONFIG_SPI_FLASH_S28HX_T=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_MT35XU=y
 CONFIG_PINCTRL=y

diff --git a/drivers/mtd/spi/Kconfig b/drivers/mtd/spi/Kconfig
index 096338f27bf1e3fbe251a35eaeed919bf5ac4451..7b858a3a9190da51eacf291c9623d1dc96afe294 100644 (file)
--- a/drivers/mtd/spi/Kconfig
+++ b/drivers/mtd/spi/Kconfig
@@ -166,13 +166,13 @@ config SPI_FLASH_SPANSION
        help
          Add support for various Spansion SPI flash chips (S25FLxxx)
 
-config SPI_FLASH_S28HS512T
-       bool "Cypress S28HS512T chip support"
+config SPI_FLASH_S28HX_T
+       bool "Cypress SEMPER Octal (S28) chip support"
        depends on SPI_FLASH_SPANSION
        help
-        Add support for the Cypress S28HS512T chip. This is a separate config
-        because the fixup hooks for this flash add extra size overhead. Boards
-        that don't use the flash can disable this to save space.
+        Add support for the Cypress S28HL-T and S28HS-T chip. This is a separate
+        config because the fixup hooks for this flash add extra size overhead.
+        Boards that don't use the flash can disable this to save space.
 
 config SPI_FLASH_STMICRO
        bool "STMicro SPI flash support"

diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
index b200457ecdea1a659e23154ba184b901b5bc883d..a7879945986d5118e551b57c253c4f66f06bc2ee 100644 (file)
--- a/drivers/mtd/spi/spi-nor-core.c
+++ b/drivers/mtd/spi/spi-nor-core.c
@@ -3333,7 +3333,7 @@ static struct spi_nor_fixups s25fl256l_fixups = {
 };
 #endif
 
-#ifdef CONFIG_SPI_FLASH_S28HS512T
+#ifdef CONFIG_SPI_FLASH_S28HX_T
 /**
  * spi_nor_cypress_octal_dtr_enable() - Enable octal DTR on Cypress flashes.
  * @nor:               pointer to a 'struct spi_nor'
@@ -3514,7 +3514,7 @@ static struct spi_nor_fixups s28hx_t_fixups = {
        .post_sfdp = s28hx_t_post_sfdp_fixup,
        .post_bfpt = s28hx_t_post_bfpt_fixup,
 };
-#endif /* CONFIG_SPI_FLASH_S28HS512T */
+#endif /* CONFIG_SPI_FLASH_S28HX_T */
 
 #ifdef CONFIG_SPI_FLASH_MT35XU
 static int spi_nor_micron_octal_dtr_enable(struct spi_nor *nor)
@@ -3845,7 +3845,7 @@ void spi_nor_set_fixups(struct spi_nor *nor)
                nor->fixups = &s25fl256l_fixups;
 #endif
 
-#ifdef CONFIG_SPI_FLASH_S28HS512T
+#ifdef CONFIG_SPI_FLASH_S28HX_T
        if (!strcmp(nor->info->name, "s28hs512t"))
                nor->fixups = &s28hx_t_fixups;
 #endif

diff --git a/drivers/mtd/spi/spi-nor-ids.c b/drivers/mtd/spi/spi-nor-ids.c
index 65eb35a9185c0342f0731ff3ed93c1560c860bbe..e146d2464de55ad11a2c032ee117675e552cdc8d 100644 (file)
--- a/drivers/mtd/spi/spi-nor-ids.c
+++ b/drivers/mtd/spi/spi-nor-ids.c
@@ -294,7 +294,7 @@ const struct flash_info spi_nor_ids[] = {
                USE_CLSR) },
        { INFO6("s25hs02gt",  0x342b1c, 0x0f0090, 256 * 1024, 1024,
                SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) },
-#ifdef CONFIG_SPI_FLASH_S28HS512T
+#ifdef CONFIG_SPI_FLASH_S28HX_T
        { INFO("s28hs512t",  0x345b1a,      0, 256 * 1024, 256, SPI_NOR_OCTAL_DTR_READ) },
 #endif
 #endif