spi: Migrate CONFIG_SH_QSPI to Kconfig

Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>

diff --git a/configs/alt_defconfig b/configs/alt_defconfig
index 6d2e12a..172461a 100644 (file)
--- a/configs/alt_defconfig
+++ b/configs/alt_defconfig
@@ -33,6 +33,7 @@ CONFIG_NETDEVICES=y
 CONFIG_SH_ETHER=y
 CONFIG_BAUDRATE=38400
 CONFIG_SCIF_CONSOLE=y
+CONFIG_SH_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y

diff --git a/configs/gose_defconfig b/configs/gose_defconfig
index 22bc600..baa8d85 100644 (file)
--- a/configs/gose_defconfig
+++ b/configs/gose_defconfig
@@ -33,6 +33,7 @@ CONFIG_NETDEVICES=y
 CONFIG_SH_ETHER=y
 CONFIG_BAUDRATE=38400
 CONFIG_SCIF_CONSOLE=y
+CONFIG_SH_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y

diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig
index be46f72..1246dde 100644 (file)
--- a/configs/koelsch_defconfig
+++ b/configs/koelsch_defconfig
@@ -33,6 +33,7 @@ CONFIG_NETDEVICES=y
 CONFIG_SH_ETHER=y
 CONFIG_BAUDRATE=38400
 CONFIG_SCIF_CONSOLE=y
+CONFIG_SH_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y

diff --git a/configs/lager_defconfig b/configs/lager_defconfig
index debe716..1ce7949 100644 (file)
--- a/configs/lager_defconfig
+++ b/configs/lager_defconfig
@@ -33,6 +33,7 @@ CONFIG_NETDEVICES=y
 CONFIG_SH_ETHER=y
 CONFIG_BAUDRATE=38400
 CONFIG_SCIF_CONSOLE=y
+CONFIG_SH_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y

diff --git a/configs/porter_defconfig b/configs/porter_defconfig
index 3e3adba..38501d0 100644 (file)
--- a/configs/porter_defconfig
+++ b/configs/porter_defconfig
@@ -49,6 +49,7 @@ CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
 CONFIG_SCIF_CONSOLE=y
+CONFIG_SH_QSPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y

diff --git a/configs/silk_defconfig b/configs/silk_defconfig
index b01d198..bba0ce7 100644 (file)
--- a/configs/silk_defconfig
+++ b/configs/silk_defconfig
@@ -33,6 +33,7 @@ CONFIG_NETDEVICES=y
 CONFIG_SH_ETHER=y
 CONFIG_BAUDRATE=38400
 CONFIG_SCIF_CONSOLE=y
+CONFIG_SH_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y

diff --git a/configs/stout_defconfig b/configs/stout_defconfig
index 1777bf9..fd7e2dc 100644 (file)
--- a/configs/stout_defconfig
+++ b/configs/stout_defconfig
@@ -33,6 +33,7 @@ CONFIG_NETDEVICES=y
 CONFIG_SH_ETHER=y
 CONFIG_BAUDRATE=38400
 CONFIG_SCIF_CONSOLE=y
+CONFIG_SH_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 3d2cd2d..a1f9373 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -245,6 +245,12 @@ config SH_SPI
          Enable the SuperH SPI controller driver. This driver can be used
          on various SuperH SoCs, such as SH7757.
 
+config SH_QSPI
+       bool "Renesas Quad SPI driver"
+       help
+         Enable the Renesas Quad SPI controller driver. This driver can be
+         used on Renesas SoCs.
+
 config TI_QSPI
        bool "TI QSPI driver"
        help

diff --git a/include/configs/alt.h b/include/configs/alt.h
index 9a9e4d9..f5e41db 100644 (file)
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -33,7 +33,6 @@
 
 /* FLASH */
 #define CONFIG_SPI
-#define CONFIG_SH_QSPI
 #define CONFIG_SPI_FLASH_QUAD
 
 /* SH Ether */

diff --git a/include/configs/blanche.h b/include/configs/blanche.h
index a3ebe61..506b783 100755 (executable)
--- a/include/configs/blanche.h
+++ b/include/configs/blanche.h
@@ -39,7 +39,6 @@
 /* FLASH */
 #if !defined(CONFIG_MTD_NOR_FLASH)
 #define CONFIG_SPI
-#define CONFIG_SH_QSPI
 #define CONFIG_SH_QSPI_BASE    0xE6B10000
 #else
 #define CONFIG_SYS_FLASH_CFI

diff --git a/include/configs/gose.h b/include/configs/gose.h
index a2a24b6..3531621 100644 (file)
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -34,7 +34,6 @@
 
 /* FLASH */
 #define CONFIG_SPI
-#define CONFIG_SH_QSPI
 
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT       0

diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index 79587b8..4d093de 100644 (file)
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -34,7 +34,6 @@
 
 /* FLASH */
 #define CONFIG_SPI
-#define CONFIG_SH_QSPI
 
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT       0

diff --git a/include/configs/lager.h b/include/configs/lager.h
index a3d35d4..45a76f8 100644 (file)
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -34,7 +34,6 @@
 
 /* SPI */
 #define CONFIG_SPI
-#define CONFIG_SH_QSPI
 
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT       0

diff --git a/include/configs/porter.h b/include/configs/porter.h
index d293f06..b4a317f 100644 (file)
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -34,7 +34,6 @@
 
 /* FLASH */
 #define CONFIG_SPI
-#define CONFIG_SH_QSPI
 #define CONFIG_SPI_FLASH_QUAD
 
 /* SH Ether */

diff --git a/include/configs/silk.h b/include/configs/silk.h
index fce4b2d..5d85c0d 100644 (file)
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -34,7 +34,6 @@
 
 /* FLASH */
 #define CONFIG_SPI
-#define CONFIG_SH_QSPI
 #define CONFIG_SPI_FLASH_QUAD
 
 /* SH Ether */

diff --git a/include/configs/stout.h b/include/configs/stout.h
index 3db46be..b81103e 100644 (file)
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -37,7 +37,6 @@
 
 /* SPI */
 #define CONFIG_SPI
-#define CONFIG_SH_QSPI
 #define CONFIG_SPI_FLASH_QUAD
 
 /* SH Ether */

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 9626761..c428712 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1897,7 +1897,6 @@ CONFIG_SH_I2C_DATA_LOW
 CONFIG_SH_MMCIF
 CONFIG_SH_MMCIF_ADDR
 CONFIG_SH_MMCIF_CLK
-CONFIG_SH_QSPI
 CONFIG_SH_QSPI_BASE
 CONFIG_SH_SCIF_CLK_FREQ
 CONFIG_SH_SDHI_FREQ