Signed-off-by: Tuomas Tynkkynen tuomas@tuxera.com --- README | 5 ----- configs/sh7752evb_defconfig | 1 + configs/sh7753evb_defconfig | 1 + configs/sh7757lcr_defconfig | 1 + drivers/spi/Kconfig | 6 ++++++ include/configs/sh7752evb.h | 1 - include/configs/sh7753evb.h | 1 - include/configs/sh7757lcr.h | 1 - scripts/config_whitelist.txt | 1 - 9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/README b/README index b055ae7ef2..4044e8575f 100644 --- a/README +++ b/README @@ -2001,11 +2001,6 @@ The following options need to be configured: SPI EEPROM, also an instance works with Crystal A/D and D/As on the SACSng board)
- CONFIG_SH_SPI - - Enables the driver for SPI controller on SuperH. Currently - only SH7757 is supported. - CONFIG_SOFT_SPI
Enables a software (bit-bang) SPI driver rather than diff --git a/configs/sh7752evb_defconfig b/configs/sh7752evb_defconfig index bbab9c06f3..d56992dc0a 100644 --- a/configs/sh7752evb_defconfig +++ b/configs/sh7752evb_defconfig @@ -36,4 +36,5 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_NETDEVICES=y CONFIG_SH_ETHER=y CONFIG_SCIF_CONSOLE=y +CONFIG_SH_SPI=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/sh7753evb_defconfig b/configs/sh7753evb_defconfig index 919e00d5a4..c50285a146 100644 --- a/configs/sh7753evb_defconfig +++ b/configs/sh7753evb_defconfig @@ -35,4 +35,5 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_NETDEVICES=y CONFIG_SH_ETHER=y CONFIG_SCIF_CONSOLE=y +CONFIG_SH_SPI=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/sh7757lcr_defconfig b/configs/sh7757lcr_defconfig index e47bbcf175..3a3a8c9e63 100644 --- a/configs/sh7757lcr_defconfig +++ b/configs/sh7757lcr_defconfig @@ -35,4 +35,5 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_NETDEVICES=y CONFIG_SH_ETHER=y CONFIG_SCIF_CONSOLE=y +CONFIG_SH_SPI=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 1e95dc4559..3d2cd2db00 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -239,6 +239,12 @@ config DAVINCI_SPI help Enable the Davinci SPI driver
+config SH_SPI + bool "SuperH SPI driver" + help + Enable the SuperH SPI controller driver. This driver can be used + on various SuperH SoCs, such as SH7757. + config TI_QSPI bool "TI QSPI driver" help diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h index ee57eb2fd1..401c2e550a 100644 --- a/include/configs/sh7752evb.h +++ b/include/configs/sh7752evb.h @@ -63,7 +63,6 @@ #define SH7752EVB_ETHERNET_NUM_CH 2
/* SPI */ -#define CONFIG_SH_SPI 1 #define CONFIG_SH_SPI_BASE 0xfe002000
/* MMCIF */ diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h index e7f9f61974..6db33ed41d 100644 --- a/include/configs/sh7753evb.h +++ b/include/configs/sh7753evb.h @@ -63,7 +63,6 @@ #define SH7753EVB_ETHERNET_NUM_CH 2
/* SPI */ -#define CONFIG_SH_SPI 1 #define CONFIG_SH_SPI_BASE 0xfe002000
/* MMCIF */ diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h index a2b3307804..5f720c20e2 100644 --- a/include/configs/sh7757lcr.h +++ b/include/configs/sh7757lcr.h @@ -65,7 +65,6 @@ #define SH7757LCR_GIGA_ETHERNET_NUM_CH 2
/* SPI */ -#define CONFIG_SH_SPI 1 #define CONFIG_SH_SPI_BASE 0xfe002000
/* MMCIF */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ef83c00c1b..dabc171f1e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1909,7 +1909,6 @@ CONFIG_SH_QSPI_BASE CONFIG_SH_SCIF_CLK_FREQ CONFIG_SH_SDHI_FREQ CONFIG_SH_SDRAM_OFFSET -CONFIG_SH_SPI CONFIG_SH_SPI_BASE CONFIG_SH_TMU_CLK_FREQ CONFIG_SIEMENS_DRACO