diff options
| -rw-r--r-- | configs/bg0900_defconfig | 1 | ||||
| -rw-r--r-- | configs/m28evk_defconfig | 1 | ||||
| -rw-r--r-- | configs/mx28evk_auart_console_defconfig | 1 | ||||
| -rw-r--r-- | configs/mx28evk_defconfig | 1 | ||||
| -rw-r--r-- | configs/mx28evk_nand_defconfig | 1 | ||||
| -rw-r--r-- | configs/mx28evk_spi_defconfig | 1 | ||||
| -rw-r--r-- | drivers/spi/Kconfig | 6 | ||||
| -rw-r--r-- | include/configs/mxs.h | 1 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
9 files changed, 12 insertions, 2 deletions
diff --git a/configs/bg0900_defconfig b/configs/bg0900_defconfig index e097f1c1319..20c8febf311 100644 --- a/configs/bg0900_defconfig +++ b/configs/bg0900_defconfig @@ -32,4 +32,5 @@ CONFIG_NAND_MXS=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 be0c6814d8c..373519d57ec 100644 --- a/configs/m28evk_defconfig +++ b/configs/m28evk_defconfig @@ -46,6 +46,7 @@ CONFIG_NAND=y CONFIG_NAND_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 a3590bb2c21..e9f6ff4e166 100644 --- a/configs/mx28evk_auart_console_defconfig +++ b/configs/mx28evk_auart_console_defconfig @@ -41,6 +41,7 @@ CONFIG_NAND=y CONFIG_NAND_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 5d661ee13d7..b57bee65c7f 100644 --- a/configs/mx28evk_defconfig +++ b/configs/mx28evk_defconfig @@ -41,6 +41,7 @@ CONFIG_NAND=y CONFIG_NAND_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 3b9962f3b3f..8d8bafad002 100644 --- a/configs/mx28evk_nand_defconfig +++ b/configs/mx28evk_nand_defconfig @@ -40,6 +40,7 @@ CONFIG_NAND=y CONFIG_NAND_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 fee7f216f62..8959035edb6 100644 --- a/configs/mx28evk_spi_defconfig +++ b/configs/mx28evk_spi_defconfig @@ -40,6 +40,7 @@ CONFIG_NAND=y CONFIG_NAND_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 a1f9373af15..686105c0e27 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 0bc3d499ba6..31877b8ec10 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -147,7 +147,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 c428712c012..275c20b39e0 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1437,7 +1437,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 |