diff options
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/Kconfig | 10 | ||||
| -rw-r--r-- | drivers/spi/cf_spi.c | 12 | ||||
| -rw-r--r-- | drivers/spi/sandbox_spi.c | 4 |
3 files changed, 16 insertions, 10 deletions
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index c6900f449d5..64ceed12ce4 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -429,6 +429,16 @@ config SANDBOX_SPI }; }; +config SANDBOX_SPI_MAX_BUS + int + depends on SANDBOX + default 1 + +config SANDBOX_SPI_MAX_CS + int + depends on SANDBOX + default 10 + config SPI_ASPEED_SMC bool "ASPEED SPI flash controller driver" depends on DM_SPI && SPI_MEM diff --git a/drivers/spi/cf_spi.c b/drivers/spi/cf_spi.c index ea23357090f..1a841b5dcef 100644 --- a/drivers/spi/cf_spi.c +++ b/drivers/spi/cf_spi.c @@ -32,11 +32,11 @@ struct coldfire_spi_priv { DECLARE_GLOBAL_DATA_PTR; -#ifndef CONFIG_SPI_IDLE_VAL +#ifndef SPI_IDLE_VAL #if defined(CONFIG_SPI_MMC) -#define CONFIG_SPI_IDLE_VAL 0xFFFF +#define SPI_IDLE_VAL 0xFFFF #else -#define CONFIG_SPI_IDLE_VAL 0x0 +#define SPI_IDLE_VAL 0x0 #endif #endif @@ -184,7 +184,7 @@ static int coldfire_spi_xfer(struct udevice *dev, unsigned int bitlen, } if (din) { - cfspi_tx(cfspi, ctrl, CONFIG_SPI_IDLE_VAL); + cfspi_tx(cfspi, ctrl, SPI_IDLE_VAL); if (cfspi->charbit == 16) *spi_rd16++ = cfspi_rx(cfspi); else @@ -208,7 +208,7 @@ static int coldfire_spi_xfer(struct udevice *dev, unsigned int bitlen, } if (din) { - cfspi_tx(cfspi, ctrl, CONFIG_SPI_IDLE_VAL); + cfspi_tx(cfspi, ctrl, SPI_IDLE_VAL); if (cfspi->charbit == 16) *spi_rd16 = cfspi_rx(cfspi); else @@ -216,7 +216,7 @@ static int coldfire_spi_xfer(struct udevice *dev, unsigned int bitlen, } } else { /* dummy read */ - cfspi_tx(cfspi, ctrl, CONFIG_SPI_IDLE_VAL); + cfspi_tx(cfspi, ctrl, SPI_IDLE_VAL); cfspi_rx(cfspi); } diff --git a/drivers/spi/sandbox_spi.c b/drivers/spi/sandbox_spi.c index 0564d8b55e7..f844597d04c 100644 --- a/drivers/spi/sandbox_spi.c +++ b/drivers/spi/sandbox_spi.c @@ -24,10 +24,6 @@ #include <dm/acpi.h> #include <dm/device-internal.h> -#ifndef CONFIG_SPI_IDLE_VAL -# define CONFIG_SPI_IDLE_VAL 0xFF -#endif - /** * struct sandbox_spi_priv - Sandbox SPI private data * |