Signed-off-by: Tuomas Tynkkynen tuomas@tuxera.com --- configs/bg0900_defconfig | 1 + configs/m28evk_defconfig | 1 + configs/mx28evk_auart_console_defconfig | 1 + configs/mx28evk_defconfig | 1 + configs/mx28evk_nand_defconfig | 1 + configs/mx28evk_spi_defconfig | 1 + drivers/spi/Kconfig | 6 ++++++ include/configs/mxs.h | 1 - scripts/config_whitelist.txt | 1 - 9 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/configs/bg0900_defconfig b/configs/bg0900_defconfig index 72616ae5e5..cf2abc6b4c 100644 --- a/configs/bg0900_defconfig +++ b/configs/bg0900_defconfig @@ -29,4 +29,5 @@ CONFIG_DOS_PARTITION=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y +CONFIG_MXS_SPI=y CONFIG_OF_LIBFDT=y diff --git a/configs/m28evk_defconfig b/configs/m28evk_defconfig index 3bc6b1835f..dd2d25d251 100644 --- a/configs/m28evk_defconfig +++ b/configs/m28evk_defconfig @@ -43,6 +43,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y +CONFIG_MXS_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/mx28evk_auart_console_defconfig b/configs/mx28evk_auart_console_defconfig index c4977564e4..c1360f1a50 100644 --- a/configs/mx28evk_auart_console_defconfig +++ b/configs/mx28evk_auart_console_defconfig @@ -38,6 +38,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_MMC_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y +CONFIG_MXS_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/mx28evk_defconfig b/configs/mx28evk_defconfig index 40c9df2809..de739e0c37 100644 --- a/configs/mx28evk_defconfig +++ b/configs/mx28evk_defconfig @@ -38,6 +38,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_MMC_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y +CONFIG_MXS_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/mx28evk_nand_defconfig b/configs/mx28evk_nand_defconfig index ea97f401d1..103cc8c0c7 100644 --- a/configs/mx28evk_nand_defconfig +++ b/configs/mx28evk_nand_defconfig @@ -37,6 +37,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y +CONFIG_MXS_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/mx28evk_spi_defconfig b/configs/mx28evk_spi_defconfig index 34e9927c0f..17bc73030c 100644 --- a/configs/mx28evk_spi_defconfig +++ b/configs/mx28evk_spi_defconfig @@ -37,6 +37,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_MMC_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y +CONFIG_MXS_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index a1f9373af1..686105c0e2 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -263,6 +263,12 @@ config MPC8XX_SPI help Enable support for SPI on MPC8XX
+config MXS_SPI + bool "MXS SPI Driver" + help + Enable the MXS SPI controller driver. This driver can be used + on the i.MX23 and i.MX28 SoCs. + config OMAP3_SPI bool "McSPI driver for OMAP" help diff --git a/include/configs/mxs.h b/include/configs/mxs.h index 3a27c15060..5beea7fcea 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -150,7 +150,6 @@ /* SPI */ #ifdef CONFIG_CMD_SPI #define CONFIG_HARD_SPI -#define CONFIG_MXS_SPI #define CONFIG_SPI_HALF_DUPLEX #endif
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 052031e1be..1b43512bc8 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1444,7 +1444,6 @@ CONFIG_MXS_AUART CONFIG_MXS_AUART_BASE CONFIG_MXS_GPIO CONFIG_MXS_OCOTP -CONFIG_MXS_SPI CONFIG_MX_CYCLIC CONFIG_MY_OPTION CONFIG_NANDFLASH_SIZE