Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-16 01:44:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mtd: spi-nor: Rename SPI_ADVANCE to SPI_STACKED_PARALLEL

Browse source 
The SPI_ADVANCE description does not explain what the switch does.
It does not have anything to do with any advanced functionality, it
only gates off support for stacked and parallel SPI NORs. Rename the
Kconfig symbol, update description, and move it right next to Xilinx
hardware as it seems to be specific to this hardware. Make sure the
symbol is also protected by if DM_SPI in Kconfig.

Fixes: 5d40b3d384 ("mtd: spi-nor: Add parallel and stacked memories support")
Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
This commit is contained in:
Marek Vasut 2024-10-26 22:16:25 +02:00 • committed by Tom Rini
parent 003157bd1c
commit f896aa6567
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/mtd/spi/spi-nor-core.c
View file

@ -3047,7 +3047,7 @@ static int spi_nor_init_params(struct spi_nor *nor,
const struct flash_info *info,
struct spi_nor_flash_parameter *params)
{
#if CONFIG_IS_ENABLED(DM_SPI) && CONFIG_IS_ENABLED(SPI_ADVANCE)
#if CONFIG_IS_ENABLED(DM_SPI) && CONFIG_IS_ENABLED(SPI_STACKED_PARALLEL)
struct udevice *dev = nor->spi->dev;
u64 flash_size[SNOR_FLASH_CNT_MAX] = {0};
u32 idx = 0, i = 0;
@ -3172,7 +3172,7 @@ static int spi_nor_init_params(struct spi_nor *nor,
spi_nor_post_sfdp_fixups(nor, params);
}
#if CONFIG_IS_ENABLED(DM_SPI) && CONFIG_IS_ENABLED(SPI_ADVANCE)
#if CONFIG_IS_ENABLED(DM_SPI) && CONFIG_IS_ENABLED(SPI_STACKED_PARALLEL)
/*
* The flashes that are connected in stacked mode should be of same make.
* Except the flash size all other properties are identical for all the

12
drivers/spi/Kconfig
View file

@ -20,12 +20,6 @@ menuconfig SPI
if SPI
config SPI_ADVANCE
bool "Enable the advance feature"
help
Enable the SPI advance feature support. By default this is disabled.
If you intend to use the advance feature support you should enable.
config DM_SPI
bool "Enable Driver Model for SPI drivers"
depends on DM
@ -615,6 +609,12 @@ config ZYNQMP_GQSPI
This option is used to enable ZynqMP QSPI controller driver which
is used to communicate with qspi flash devices.
config SPI_STACKED_PARALLEL
bool "Enable support for stacked or parallel memories"
help
Enable support for stacked/or parallel memories. This functionality
may appear on Xilinx hardware. By default this is disabled.
endif # if DM_SPI
config FSL_ESPI

2
include/linux/mtd/spi-nor.h
View file

@ -308,7 +308,7 @@ enum spi_nor_option_flags {
SNOR_F_BROKEN_RESET = BIT(6),
SNOR_F_SOFT_RESET = BIT(7),
SNOR_F_IO_MODE_EN_VOLATILE = BIT(8),
#if defined(CONFIG_SPI_ADVANCE)
#if defined(CONFIG_SPI_STACKED_PARALLEL)
SNOR_F_HAS_STACKED = BIT(9),
SNOR_F_HAS_PARALLEL = BIT(10),
#else