LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Takahiro Kuwano 2022-08-25 16:48:47 +09:00 committed by Jagan Teki
parent 4bfeb00cc1
commit f422c4bec7
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/j721s2_evm_a72_defconfig
View File

@ -149,7 +149,7 @@ CONFIG_SPI_FLASH_SFDP_SUPPORT=y
CONFIG_SPI_FLASH_SOFT_RESET=y CONFIG_SPI_FLASH_SOFT_RESET=y
CONFIG_SPI_FLASH_SOFT_RESET_ON_BOOT=y CONFIG_SPI_FLASH_SOFT_RESET_ON_BOOT=y
CONFIG_SPI_FLASH_SPANSION=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_STMICRO=y
CONFIG_SPI_FLASH_MT35XU=y CONFIG_SPI_FLASH_MT35XU=y
# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set

2
configs/j721s2_evm_r5_defconfig
View File

@ -128,7 +128,7 @@ CONFIG_SPI_FLASH_SFDP_SUPPORT=y
CONFIG_SPI_FLASH_SOFT_RESET=y CONFIG_SPI_FLASH_SOFT_RESET=y
CONFIG_SPI_FLASH_SOFT_RESET_ON_BOOT=y CONFIG_SPI_FLASH_SOFT_RESET_ON_BOOT=y
CONFIG_SPI_FLASH_SPANSION=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_STMICRO=y
CONFIG_SPI_FLASH_MT35XU=y CONFIG_SPI_FLASH_MT35XU=y
CONFIG_PINCTRL=y CONFIG_PINCTRL=y

10
drivers/mtd/spi/Kconfig
View File

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

6
drivers/mtd/spi/spi-nor-core.c
View File

@ -3333,7 +3333,7 @@ static struct spi_nor_fixups s25fl256l_fixups = {
}; };
#endif #endif
#ifdef CONFIG_SPI_FLASH_S28HS512T #ifdef CONFIG_SPI_FLASH_S28HX_T
/** /**
* spi_nor_cypress_octal_dtr_enable() - Enable octal DTR on Cypress flashes. * spi_nor_cypress_octal_dtr_enable() - Enable octal DTR on Cypress flashes.
* @nor: pointer to a 'struct spi_nor' * @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_sfdp = s28hx_t_post_sfdp_fixup,
.post_bfpt = s28hx_t_post_bfpt_fixup, .post_bfpt = s28hx_t_post_bfpt_fixup,
}; };
#endif /* CONFIG_SPI_FLASH_S28HS512T */ #endif /* CONFIG_SPI_FLASH_S28HX_T */
#ifdef CONFIG_SPI_FLASH_MT35XU #ifdef CONFIG_SPI_FLASH_MT35XU
static int spi_nor_micron_octal_dtr_enable(struct spi_nor *nor) 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; nor->fixups = &s25fl256l_fixups;
#endif #endif
#ifdef CONFIG_SPI_FLASH_S28HS512T #ifdef CONFIG_SPI_FLASH_S28HX_T
if (!strcmp(nor->info->name, "s28hs512t")) if (!strcmp(nor->info->name, "s28hs512t"))
nor->fixups = &s28hx_t_fixups; nor->fixups = &s28hx_t_fixups;
#endif #endif

2
drivers/mtd/spi/spi-nor-ids.c
View File

@ -294,7 +294,7 @@ const struct flash_info spi_nor_ids[] = {
USE_CLSR) }, USE_CLSR) },
{ INFO6("s25hs02gt", 0x342b1c, 0x0f0090, 256 * 1024, 1024, { INFO6("s25hs02gt", 0x342b1c, 0x0f0090, 256 * 1024, 1024,
SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) }, 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) }, { INFO("s28hs512t", 0x345b1a, 0, 256 * 1024, 256, SPI_NOR_OCTAL_DTR_READ) },
#endif #endif
#endif #endif