mtd: spi-nor-ids: Add s28hl512t, s28hl01gt, and s28hs01gt IDs

Add flash info table entries for s28hl512gt, s28hl01gt, and s28hs01gt.
These devices have the same functionality as s28hs512t.

In spi-nor-core, use device ID byte to detect S28 family instead of
device name.

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

diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
index a7879945986d5118e551b57c253c4f66f06bc2ee..ec9b07a78f31ed0854b0747061f99a94d6f2dc64 100644 (file)
--- a/drivers/mtd/spi/spi-nor-core.c
+++ b/drivers/mtd/spi/spi-nor-core.c
@@ -3835,6 +3835,13 @@ void spi_nor_set_fixups(struct spi_nor *nor)
                        nor->fixups = &s25hx_t_fixups;
                        break;
 
+#ifdef CONFIG_SPI_FLASH_S28HX_T
+               case 0x5a: /* S28HL (Octal, 3.3V) */
+               case 0x5b: /* S28HS (Octal, 1.8V) */
+                       nor->fixups = &s28hx_t_fixups;
+                       break;
+#endif
+
                default:
                        break;
                }
@@ -3845,11 +3852,6 @@ void spi_nor_set_fixups(struct spi_nor *nor)
                nor->fixups = &s25fl256l_fixups;
 #endif
 
-#ifdef CONFIG_SPI_FLASH_S28HX_T
-       if (!strcmp(nor->info->name, "s28hs512t"))
-               nor->fixups = &s28hx_t_fixups;
-#endif
-
 #ifdef CONFIG_SPI_FLASH_MT35XU
        if (!strcmp(nor->info->name, "mt35xu512aba"))
                nor->fixups = &mt35xu512aba_fixups;

diff --git a/drivers/mtd/spi/spi-nor-ids.c b/drivers/mtd/spi/spi-nor-ids.c
index e146d2464de55ad11a2c032ee117675e552cdc8d..5f8f3ec955d9149dc5ac900c8c2a35248a6bd6cc 100644 (file)
--- a/drivers/mtd/spi/spi-nor-ids.c
+++ b/drivers/mtd/spi/spi-nor-ids.c
@@ -295,7 +295,10 @@ const struct flash_info spi_nor_ids[] = {
        { INFO6("s25hs02gt",  0x342b1c, 0x0f0090, 256 * 1024, 1024,
                SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) },
 #ifdef CONFIG_SPI_FLASH_S28HX_T
+       { INFO("s28hl512t",  0x345a1a,      0, 256 * 1024, 256, SPI_NOR_OCTAL_DTR_READ) },
+       { INFO("s28hl01gt",  0x345a1b,      0, 256 * 1024, 512, SPI_NOR_OCTAL_DTR_READ) },
        { INFO("s28hs512t",  0x345b1a,      0, 256 * 1024, 256, SPI_NOR_OCTAL_DTR_READ) },
+       { INFO("s28hs01gt",  0x345b1b,      0, 256 * 1024, 512, SPI_NOR_OCTAL_DTR_READ) },
 #endif
 #endif
 #ifdef CONFIG_SPI_FLASH_SST            /* SST */