UPSTREAM: spi: Migrate CONFIG_SH_QSPI to Kconfig

Change-Id: I51b0a222d7f5d4bf8925f7544c50d8f35da235e2
Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
(cherry picked from commit a5dfabea19f961826509118513f833cea25797bb)
This commit is contained in:
Tuomas Tynkkynen 2018-02-07 02:42:17 +02:00 committed by Kever Yang
parent 99c184906c
commit 3ad77667ab
17 changed files with 13 additions and 9 deletions

View File

@ -41,6 +41,7 @@ CONFIG_PHYLIB=y
CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL=y
CONFIG_BAUDRATE=38400 CONFIG_BAUDRATE=38400
CONFIG_SCIF_CONSOLE=y CONFIG_SCIF_CONSOLE=y
CONFIG_SH_QSPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

View File

@ -40,6 +40,7 @@ CONFIG_PHYLIB=y
CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL=y
CONFIG_BAUDRATE=38400 CONFIG_BAUDRATE=38400
CONFIG_SCIF_CONSOLE=y CONFIG_SCIF_CONSOLE=y
CONFIG_SH_QSPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

View File

@ -40,6 +40,7 @@ CONFIG_PHYLIB=y
CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL=y
CONFIG_BAUDRATE=38400 CONFIG_BAUDRATE=38400
CONFIG_SCIF_CONSOLE=y CONFIG_SCIF_CONSOLE=y
CONFIG_SH_QSPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

View File

@ -42,6 +42,7 @@ CONFIG_PHYLIB=y
CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL=y
CONFIG_BAUDRATE=38400 CONFIG_BAUDRATE=38400
CONFIG_SCIF_CONSOLE=y CONFIG_SCIF_CONSOLE=y
CONFIG_SH_QSPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

View File

@ -40,6 +40,7 @@ CONFIG_PHYLIB=y
CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL=y
CONFIG_BAUDRATE=38400 CONFIG_BAUDRATE=38400
CONFIG_SCIF_CONSOLE=y CONFIG_SCIF_CONSOLE=y
CONFIG_SH_QSPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

View File

@ -42,6 +42,7 @@ CONFIG_PHYLIB=y
CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL=y
CONFIG_BAUDRATE=38400 CONFIG_BAUDRATE=38400
CONFIG_SCIF_CONSOLE=y CONFIG_SCIF_CONSOLE=y
CONFIG_SH_QSPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

View File

@ -40,6 +40,7 @@ CONFIG_PHYLIB=y
CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL=y
CONFIG_BAUDRATE=38400 CONFIG_BAUDRATE=38400
CONFIG_SCIF_CONSOLE=y CONFIG_SCIF_CONSOLE=y
CONFIG_SH_QSPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

View File

@ -260,6 +260,12 @@ config SH_SPI
Enable the SuperH SPI controller driver. This driver can be used Enable the SuperH SPI controller driver. This driver can be used
on various SuperH SoCs, such as SH7757. 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 config TI_QSPI
bool "TI QSPI driver" bool "TI QSPI driver"
help help

View File

@ -40,7 +40,6 @@
/* FLASH */ /* FLASH */
#define CONFIG_SPI #define CONFIG_SPI
#define CONFIG_SH_QSPI
#define CONFIG_SPI_FLASH_QUAD #define CONFIG_SPI_FLASH_QUAD
/* SH Ether */ /* SH Ether */

View File

@ -41,7 +41,6 @@
#if !defined(CONFIG_MTD_NOR_FLASH) #if !defined(CONFIG_MTD_NOR_FLASH)
#define CONFIG_SYS_TEXT_BASE 0x40000000 #define CONFIG_SYS_TEXT_BASE 0x40000000
#define CONFIG_SPI #define CONFIG_SPI
#define CONFIG_SH_QSPI
#define CONFIG_SH_QSPI_BASE 0xE6B10000 #define CONFIG_SH_QSPI_BASE 0xE6B10000
#else #else
#define CONFIG_SYS_TEXT_BASE 0x00000000 #define CONFIG_SYS_TEXT_BASE 0x00000000

View File

@ -41,7 +41,6 @@
/* FLASH */ /* FLASH */
#define CONFIG_SPI #define CONFIG_SPI
#define CONFIG_SH_QSPI
/* SH Ether */ /* SH Ether */
#define CONFIG_SH_ETHER #define CONFIG_SH_ETHER

View File

@ -41,7 +41,6 @@
/* FLASH */ /* FLASH */
#define CONFIG_SPI #define CONFIG_SPI
#define CONFIG_SH_QSPI
/* SH Ether */ /* SH Ether */
#define CONFIG_SH_ETHER #define CONFIG_SH_ETHER

View File

@ -41,7 +41,6 @@
/* SPI */ /* SPI */
#define CONFIG_SPI #define CONFIG_SPI
#define CONFIG_SH_QSPI
/* SH Ether */ /* SH Ether */
#define CONFIG_SH_ETHER #define CONFIG_SH_ETHER

View File

@ -41,7 +41,6 @@
/* FLASH */ /* FLASH */
#define CONFIG_SPI #define CONFIG_SPI
#define CONFIG_SH_QSPI
#define CONFIG_SPI_FLASH_QUAD #define CONFIG_SPI_FLASH_QUAD
/* SH Ether */ /* SH Ether */

View File

@ -41,7 +41,6 @@
/* FLASH */ /* FLASH */
#define CONFIG_SPI #define CONFIG_SPI
#define CONFIG_SH_QSPI
#define CONFIG_SPI_FLASH_QUAD #define CONFIG_SPI_FLASH_QUAD
/* SH Ether */ /* SH Ether */

View File

@ -44,7 +44,6 @@
/* SPI */ /* SPI */
#define CONFIG_SPI #define CONFIG_SPI
#define CONFIG_SH_QSPI
#define CONFIG_SPI_FLASH_QUAD #define CONFIG_SPI_FLASH_QUAD
/* SH Ether */ /* SH Ether */

View File

@ -2023,7 +2023,6 @@ CONFIG_SH_I2C_DATA_LOW
CONFIG_SH_MMCIF CONFIG_SH_MMCIF
CONFIG_SH_MMCIF_ADDR CONFIG_SH_MMCIF_ADDR
CONFIG_SH_MMCIF_CLK CONFIG_SH_MMCIF_CLK
CONFIG_SH_QSPI
CONFIG_SH_QSPI_BASE CONFIG_SH_QSPI_BASE
CONFIG_SH_SCIF_CLK_FREQ CONFIG_SH_SCIF_CLK_FREQ
CONFIG_SH_SDHI_FREQ CONFIG_SH_SDHI_FREQ