Browse Source

spi: Migrate CONFIG_MXC_SPI to Kconfig

Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
Tuomas Tynkkynen 6 years ago
parent
commit
60e5456291
82 changed files with 57 additions and 46 deletions
  1. 0 5
      README
  2. 1 0
      configs/aristainetos2_defconfig
  3. 1 0
      configs/aristainetos2b_defconfig
  4. 1 0
      configs/aristainetos_defconfig
  5. 1 0
      configs/cgtqmx6eval_defconfig
  6. 1 0
      configs/cl-som-imx7_defconfig
  7. 1 0
      configs/cm_fx6_defconfig
  8. 1 0
      configs/dh_imx6_defconfig
  9. 1 0
      configs/display5_defconfig
  10. 1 0
      configs/display5_factory_defconfig
  11. 1 0
      configs/dms-ba16-1g_defconfig
  12. 1 0
      configs/dms-ba16_defconfig
  13. 1 0
      configs/flea3_defconfig
  14. 1 0
      configs/ge_b450v3_defconfig
  15. 1 0
      configs/ge_b650v3_defconfig
  16. 1 0
      configs/ge_b850v3_defconfig
  17. 1 0
      configs/imx31_phycore_eet_defconfig
  18. 1 0
      configs/marsboard_defconfig
  19. 1 0
      configs/mccmon6_nor_defconfig
  20. 1 0
      configs/mccmon6_sd_defconfig
  21. 1 0
      configs/mx31ads_defconfig
  22. 1 0
      configs/mx31pdk_defconfig
  23. 1 0
      configs/mx35pdk_defconfig
  24. 1 0
      configs/mx51evk_defconfig
  25. 1 0
      configs/mx6qsabrelite_defconfig
  26. 1 0
      configs/mx6sabreauto_defconfig
  27. 1 0
      configs/mx6sabresd_defconfig
  28. 1 0
      configs/mx6slevk_defconfig
  29. 1 0
      configs/mx6slevk_spinor_defconfig
  30. 1 0
      configs/mx6slevk_spl_defconfig
  31. 1 0
      configs/nitrogen6dl2g_defconfig
  32. 1 0
      configs/nitrogen6dl_defconfig
  33. 1 0
      configs/nitrogen6q2g_defconfig
  34. 1 0
      configs/nitrogen6q_defconfig
  35. 1 0
      configs/nitrogen6s1g_defconfig
  36. 1 0
      configs/nitrogen6s_defconfig
  37. 1 0
      configs/ot1200_defconfig
  38. 1 0
      configs/ot1200_spl_defconfig
  39. 1 0
      configs/pcm058_defconfig
  40. 1 0
      configs/pfla02_defconfig
  41. 1 0
      configs/riotboard_defconfig
  42. 1 0
      configs/tqma6dl_mba6_mmc_defconfig
  43. 1 0
      configs/tqma6dl_mba6_spi_defconfig
  44. 1 0
      configs/tqma6q_mba6_mmc_defconfig
  45. 1 0
      configs/tqma6q_mba6_spi_defconfig
  46. 1 0
      configs/tqma6s_mba6_mmc_defconfig
  47. 1 0
      configs/tqma6s_mba6_spi_defconfig
  48. 1 0
      configs/ts4800_defconfig
  49. 1 0
      configs/woodburn_defconfig
  50. 1 0
      configs/woodburn_sd_defconfig
  51. 1 0
      configs/zc5202_defconfig
  52. 1 0
      configs/zc5601_defconfig
  53. 6 0
      drivers/spi/Kconfig
  54. 0 1
      include/configs/advantech_dms-ba16.h
  55. 0 1
      include/configs/aristainetos-common.h
  56. 0 1
      include/configs/cgtqmx6eval.h
  57. 0 1
      include/configs/cl-som-imx7.h
  58. 0 1
      include/configs/cm_fx6.h
  59. 0 1
      include/configs/dh_imx6.h
  60. 0 1
      include/configs/display5.h
  61. 0 1
      include/configs/el6x_common.h
  62. 0 1
      include/configs/embestmx6boards.h
  63. 0 1
      include/configs/flea3.h
  64. 0 1
      include/configs/ge_bx50v3.h
  65. 0 1
      include/configs/gw_ventana.h
  66. 0 1
      include/configs/imx31_phycore.h
  67. 0 1
      include/configs/mccmon6.h
  68. 0 1
      include/configs/mx31ads.h
  69. 0 1
      include/configs/mx31pdk.h
  70. 0 1
      include/configs/mx35pdk.h
  71. 0 6
      include/configs/mx51evk.h
  72. 0 1
      include/configs/mx6sabre_common.h
  73. 0 1
      include/configs/mx6slevk.h
  74. 0 1
      include/configs/nitrogen6x.h
  75. 0 1
      include/configs/ot1200.h
  76. 0 1
      include/configs/pcm058.h
  77. 0 1
      include/configs/pfla02.h
  78. 0 3
      include/configs/tqma6.h
  79. 0 6
      include/configs/tqma6_wru4.h
  80. 0 1
      include/configs/ts4800.h
  81. 0 1
      include/configs/woodburn_common.h
  82. 0 1
      scripts/config_whitelist.txt

+ 0 - 5
README

@@ -2019,11 +2019,6 @@ The following options need to be configured:
 		Currently supported on some MPC8xxx processors.	 For an
 		example, see include/configs/mpc8349emds.h.
 
-		CONFIG_MXC_SPI
-
-		Enables the driver for the SPI controllers on i.MX and MXC
-		SoCs. Currently i.MX31/35/51 are supported.
-
 		CONFIG_SYS_SPI_MXC_WAIT
 		Timeout for waiting until spi transfer completed.
 		default: (CONFIG_SYS_HZ/100)     /* 10 ms */

+ 1 - 0
configs/aristainetos2_defconfig

@@ -41,6 +41,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_VIDEO=y

+ 1 - 0
configs/aristainetos2b_defconfig

@@ -41,6 +41,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_VIDEO=y

+ 1 - 0
configs/aristainetos_defconfig

@@ -39,6 +39,7 @@ CONFIG_MTD_UBI_FASTMAP=y
 CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT=1
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_VIDEO=y

+ 1 - 0
configs/cgtqmx6eval_defconfig

@@ -50,6 +50,7 @@ CONFIG_DWC_AHSATA=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_SF=y
 CONFIG_PHYLIB=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y

+ 1 - 0
configs/cl-som-imx7_defconfig

@@ -46,6 +46,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_MXC_USB_OTG_HACTIVE=y

+ 1 - 0
configs/cm_fx6_defconfig

@@ -62,6 +62,7 @@ CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHYLIB=y
 CONFIG_DM_PMIC=y
 CONFIG_DM_REGULATOR=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y

+ 1 - 0
configs/dh_imx6_defconfig

@@ -49,6 +49,7 @@ CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
 CONFIG_FEC_MXC=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y

+ 1 - 0
configs/display5_defconfig

@@ -60,3 +60,4 @@ CONFIG_NETDEVICES=y
 CONFIG_FEC_MXC=y
 # CONFIG_SPL_DM_SERIAL is not set
 CONFIG_MXC_UART=y
+CONFIG_MXC_SPI=y

+ 1 - 0
configs/display5_factory_defconfig

@@ -66,6 +66,7 @@ CONFIG_NETDEVICES=y
 CONFIG_FEC_MXC=y
 # CONFIG_SPL_DM_SERIAL is not set
 CONFIG_MXC_UART=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Liebherr"

+ 1 - 0
configs/dms-ba16-1g_defconfig

@@ -33,6 +33,7 @@ CONFIG_DWC_AHSATA=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y

+ 1 - 0
configs/dms-ba16_defconfig

@@ -32,6 +32,7 @@ CONFIG_DWC_AHSATA=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y

+ 1 - 0
configs/flea3_defconfig

@@ -27,6 +27,7 @@ CONFIG_NAND=y
 CONFIG_NAND_MXC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
+CONFIG_MXC_SPI=y
 CONFIG_OF_LIBFDT=y
 CONFIG_FDT_FIXUP_PARTITIONS=y
 # CONFIG_EFI_LOADER is not set

+ 1 - 0
configs/ge_b450v3_defconfig

@@ -30,5 +30,6 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_CMD_E1000=y
+CONFIG_MXC_SPI=y
 CONFIG_OF_LIBFDT=y
 # CONFIG_EFI_LOADER is not set

+ 1 - 0
configs/ge_b650v3_defconfig

@@ -30,5 +30,6 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_CMD_E1000=y
+CONFIG_MXC_SPI=y
 CONFIG_OF_LIBFDT=y
 # CONFIG_EFI_LOADER is not set

+ 1 - 0
configs/ge_b850v3_defconfig

@@ -30,5 +30,6 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_CMD_E1000=y
+CONFIG_MXC_SPI=y
 CONFIG_OF_LIBFDT=y
 # CONFIG_EFI_LOADER is not set

+ 1 - 0
configs/imx31_phycore_eet_defconfig

@@ -20,4 +20,5 @@ CONFIG_NETDEVICES=y
 CONFIG_SMC911X=y
 CONFIG_SMC911X_BASE=0xa8000000
 CONFIG_SMC911X_32_BIT=y
+CONFIG_MXC_SPI=y
 CONFIG_VIDEO=y

+ 1 - 0
configs/marsboard_defconfig

@@ -22,6 +22,7 @@ CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
+CONFIG_MXC_SPI=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y

+ 1 - 0
configs/mccmon6_nor_defconfig

@@ -40,6 +40,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y

+ 1 - 0
configs/mccmon6_sd_defconfig

@@ -41,6 +41,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y

+ 1 - 0
configs/mx31ads_defconfig

@@ -11,3 +11,4 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_MXC_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_MXC_SPI=y

+ 1 - 0
configs/mx31pdk_defconfig

@@ -23,3 +23,4 @@ CONFIG_NETDEVICES=y
 CONFIG_SMC911X=y
 CONFIG_SMC911X_BASE=0xB6000000
 CONFIG_SMC911X_32_BIT=y
+CONFIG_MXC_SPI=y

+ 1 - 0
configs/mx35pdk_defconfig

@@ -31,6 +31,7 @@ CONFIG_NAND_MXC=y
 CONFIG_NETDEVICES=y
 CONFIG_SMC911X=y
 CONFIG_SMC911X_BASE=0xB6000000
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y

+ 1 - 0
configs/mx51evk_defconfig

@@ -20,6 +20,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_HOST_ETHER=y

+ 1 - 0
configs/mx6qsabrelite_defconfig

@@ -41,6 +41,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y

+ 1 - 0
configs/mx6sabreauto_defconfig

@@ -45,6 +45,7 @@ CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y

+ 1 - 0
configs/mx6sabresd_defconfig

@@ -53,6 +53,7 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PCI=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y

+ 1 - 0
configs/mx6slevk_defconfig

@@ -42,6 +42,7 @@ CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_PFUZE100=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_MXC_SPI=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y

+ 1 - 0
configs/mx6slevk_spinor_defconfig

@@ -42,6 +42,7 @@ CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_PFUZE100=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_MXC_SPI=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y

+ 1 - 0
configs/mx6slevk_spl_defconfig

@@ -50,6 +50,7 @@ CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_PFUZE100=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_MXC_SPI=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y

+ 1 - 0
configs/nitrogen6dl2g_defconfig

@@ -38,6 +38,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y

+ 1 - 0
configs/nitrogen6dl_defconfig

@@ -38,6 +38,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y

+ 1 - 0
configs/nitrogen6q2g_defconfig

@@ -40,6 +40,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y

+ 1 - 0
configs/nitrogen6q_defconfig

@@ -40,6 +40,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y

+ 1 - 0
configs/nitrogen6s1g_defconfig

@@ -38,6 +38,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y

+ 1 - 0
configs/nitrogen6s_defconfig

@@ -38,6 +38,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y

+ 1 - 0
configs/ot1200_defconfig

@@ -33,6 +33,7 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHYLIB=y
+CONFIG_MXC_SPI=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y

+ 1 - 0
configs/ot1200_spl_defconfig

@@ -41,6 +41,7 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHYLIB=y
+CONFIG_MXC_SPI=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y

+ 1 - 0
configs/pcm058_defconfig

@@ -56,5 +56,6 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_DM_THERMAL=y
 CONFIG_OF_LIBFDT=y

+ 1 - 0
configs/pfla02_defconfig

@@ -56,5 +56,6 @@ CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
 CONFIG_FEC_MXC=y
+CONFIG_MXC_SPI=y
 CONFIG_DM_THERMAL=y
 CONFIG_OF_LIBFDT=y

+ 1 - 0
configs/riotboard_defconfig

@@ -22,6 +22,7 @@ CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
+CONFIG_MXC_SPI=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y

+ 1 - 0
configs/tqma6dl_mba6_mmc_defconfig

@@ -35,6 +35,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_HOST_ETHER=y

+ 1 - 0
configs/tqma6dl_mba6_spi_defconfig

@@ -36,6 +36,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_HOST_ETHER=y

+ 1 - 0
configs/tqma6q_mba6_mmc_defconfig

@@ -34,6 +34,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_HOST_ETHER=y

+ 1 - 0
configs/tqma6q_mba6_spi_defconfig

@@ -35,6 +35,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_HOST_ETHER=y

+ 1 - 0
configs/tqma6s_mba6_mmc_defconfig

@@ -35,6 +35,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_HOST_ETHER=y

+ 1 - 0
configs/tqma6s_mba6_spi_defconfig

@@ -36,6 +36,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_HOST_ETHER=y

+ 1 - 0
configs/ts4800_defconfig

@@ -15,4 +15,5 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_PHYLIB=y
+CONFIG_MXC_SPI=y
 CONFIG_OF_LIBFDT=y

+ 1 - 0
configs/woodburn_defconfig

@@ -31,3 +31,4 @@ CONFIG_NAND=y
 CONFIG_NAND_MXC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
+CONFIG_MXC_SPI=y

+ 1 - 0
configs/woodburn_sd_defconfig

@@ -42,3 +42,4 @@ CONFIG_NAND=y
 CONFIG_NAND_MXC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
+CONFIG_MXC_SPI=y

+ 1 - 0
configs/zc5202_defconfig

@@ -31,4 +31,5 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PCI=y
+CONFIG_MXC_SPI=y
 CONFIG_OF_LIBFDT=y

+ 1 - 0
configs/zc5601_defconfig

@@ -30,4 +30,5 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
+CONFIG_MXC_SPI=y
 CONFIG_OF_LIBFDT=y

+ 6 - 0
drivers/spi/Kconfig

@@ -263,6 +263,12 @@ config MPC8XX_SPI
 	help
 	  Enable support for SPI on MPC8XX
 
+config MXC_SPI
+	bool "MXC SPI Driver"
+	help
+	  Enable the MXC SPI controller driver. This driver can be used
+	  on various i.MX SoCs such as i.MX31/35/51/6/7.
+
 config MXS_SPI
 	bool "MXS SPI Driver"
 	help

+ 0 - 1
include/configs/advantech_dms-ba16.h

@@ -68,7 +68,6 @@
 
 /* Serial Flash */
 #ifdef CONFIG_CMD_SF
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS		0
 #define CONFIG_SF_DEFAULT_CS		0
 #define CONFIG_SF_DEFAULT_SPEED	20000000

+ 0 - 1
include/configs/aristainetos-common.h

@@ -33,7 +33,6 @@
 #define CONFIG_FEC_MXC_PHYADDR		0
 
 #define CONFIG_SPI_FLASH_MTD
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_SPEED		20000000
 #define CONFIG_SF_DEFAULT_MODE		SPI_MODE_0
 #define CONFIG_SYS_SPI_ST_ENABLE_WP_PIN

+ 0 - 1
include/configs/cgtqmx6eval.h

@@ -38,7 +38,6 @@
 #define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 #define CONFIG_SPI_FLASH_SST
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS		0
 #define CONFIG_SF_DEFAULT_SPEED		20000000
 #define CONFIG_SF_DEFAULT_MODE		(SPI_MODE_0)

+ 0 - 1
include/configs/cl-som-imx7.h

@@ -148,7 +148,6 @@
 
 /* SPI Flash support */
 #define CONFIG_SPI
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS		0
 #define CONFIG_SF_DEFAULT_CS		0
 #define CONFIG_SF_DEFAULT_SPEED		20000000

+ 0 - 1
include/configs/cm_fx6.h

@@ -175,7 +175,6 @@
 
 /* SPI */
 #define CONFIG_SPI
-#define CONFIG_MXC_SPI
 
 /* NAND */
 #ifndef CONFIG_SPL_BUILD

+ 0 - 1
include/configs/dh_imx6.h

@@ -89,7 +89,6 @@
 
 /* SPI Flash Configs */
 #ifdef CONFIG_CMD_SF
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS		0
 #define CONFIG_SF_DEFAULT_CS		0
 #define CONFIG_SF_DEFAULT_SPEED		25000000

+ 0 - 1
include/configs/display5.h

@@ -65,7 +65,6 @@
 
 /* SPI NOR Flash */
 #ifdef CONFIG_CMD_SF
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS		1
 #define CONFIG_SF_DEFAULT_CS		(0 | (IMX_GPIO_NR(5, 29) << 8))
 #define CONFIG_SF_DEFAULT_SPEED		50000000

+ 0 - 1
include/configs/el6x_common.h

@@ -46,7 +46,6 @@
 #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
 
 /* Commands */
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS		3
 #define CONFIG_SF_DEFAULT_CS		0
 #define CONFIG_SF_DEFAULT_SPEED		20000000

+ 0 - 1
include/configs/embestmx6boards.h

@@ -52,7 +52,6 @@
 #define CONFIG_PHY_ATHEROS
 
 #ifdef CONFIG_CMD_SF
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS		0
 #define CONFIG_SF_DEFAULT_CS		0
 #define CONFIG_SF_DEFAULT_SPEED		20000000

+ 0 - 1
include/configs/flea3.h

@@ -46,7 +46,6 @@
 #define CONFIG_SYS_I2C_MXC_I2C3		/* enable I2C bus 3 */
 #define CONFIG_SYS_SPD_BUS_NUM		2 /* I2C3 */
 #define CONFIG_SYS_MXC_I2C3_SLAVE	0xfe
-#define CONFIG_MXC_SPI
 
 /*
  * UART (console)

+ 0 - 1
include/configs/ge_bx50v3.h

@@ -92,7 +92,6 @@
 
 /* Serial Flash */
 #ifdef CONFIG_CMD_SF
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS		0
 #define CONFIG_SF_DEFAULT_CS		0
 #define CONFIG_SF_DEFAULT_SPEED	20000000

+ 0 - 1
include/configs/gw_ventana.h

@@ -54,7 +54,6 @@
 
 /* SPI */
 #ifdef CONFIG_CMD_SF
-  #define CONFIG_MXC_SPI
   #define CONFIG_SPI_FLASH_MTD
   #define CONFIG_SPI_FLASH_BAR
   #define CONFIG_SF_DEFAULT_BUS              0

+ 0 - 1
include/configs/imx31_phycore.h

@@ -147,7 +147,6 @@
 /* EET platform additions */
 #ifdef CONFIG_TARGET_IMX31_PHYCORE_EET
 #define CONFIG_HARD_SPI
-#define CONFIG_MXC_SPI
 
 #define CONFIG_S6E63D6
 

+ 0 - 1
include/configs/mccmon6.h

@@ -45,7 +45,6 @@
 #define CONFIG_SYS_MEMTEST_START	0x10000000
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
 
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS  2
 #define CONFIG_SF_DEFAULT_CS   0
 #define CONFIG_SF_DEFAULT_SPEED 25000000

+ 0 - 1
include/configs/mx31ads.h

@@ -33,7 +33,6 @@
 #define CONFIG_MXC_UART_BASE	UART1_BASE
 
 #define CONFIG_HARD_SPI		1
-#define CONFIG_MXC_SPI		1
 #define CONFIG_DEFAULT_SPI_BUS	1
 #define CONFIG_DEFAULT_SPI_MODE	(SPI_MODE_0 | SPI_CS_HIGH)
 

+ 0 - 1
include/configs/mx31pdk.h

@@ -47,7 +47,6 @@
 #define CONFIG_MXC_UART_BASE	UART1_BASE
 
 #define CONFIG_HARD_SPI
-#define CONFIG_MXC_SPI
 #define CONFIG_DEFAULT_SPI_BUS	1
 #define CONFIG_DEFAULT_SPI_MODE	(SPI_MODE_0 | SPI_CS_HIGH)
 

+ 0 - 1
include/configs/mx35pdk.h

@@ -40,7 +40,6 @@
 #define CONFIG_SYS_I2C_MXC_I2C1		/* enable I2C bus 1 */
 #define CONFIG_SYS_I2C_MXC_I2C2		/* enable I2C bus 2 */
 #define CONFIG_SYS_I2C_MXC_I2C3		/* enable I2C bus 3 */
-#define CONFIG_MXC_SPI
 
 /*
  * PMIC Configs

+ 0 - 6
include/configs/mx51evk.h

@@ -36,12 +36,6 @@
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE	UART1_BASE
 
-/*
- * SPI Configs
- * */
-
-#define CONFIG_MXC_SPI
-
 /* PMIC Controller */
 #define CONFIG_POWER
 #define CONFIG_POWER_SPI

+ 0 - 1
include/configs/mx6sabre_common.h

@@ -31,7 +31,6 @@
 #define CONFIG_PHY_ATHEROS
 
 #ifdef CONFIG_CMD_SF
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS		0
 #define CONFIG_SF_DEFAULT_CS		0
 #define CONFIG_SF_DEFAULT_SPEED		20000000

+ 0 - 1
include/configs/mx6slevk.h

@@ -148,7 +148,6 @@
 #endif
 
 #ifdef CONFIG_CMD_SF
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS		0
 #define CONFIG_SF_DEFAULT_CS		0
 #define CONFIG_SF_DEFAULT_SPEED		20000000

+ 0 - 1
include/configs/nitrogen6x.h

@@ -25,7 +25,6 @@
 #define CONFIG_MXC_UART_BASE	       UART2_BASE
 
 #ifdef CONFIG_CMD_SF
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS  0
 #define CONFIG_SF_DEFAULT_CS   0
 #define CONFIG_SF_DEFAULT_SPEED 25000000

+ 0 - 1
include/configs/ot1200.h

@@ -21,7 +21,6 @@
 
 /* SF Configs */
 #define CONFIG_SPI
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS  2
 #define CONFIG_SF_DEFAULT_CS   0
 #define CONFIG_SF_DEFAULT_SPEED 25000000

+ 0 - 1
include/configs/pcm058.h

@@ -44,7 +44,6 @@
 #define CONFIG_FEC_MXC_PHYADDR		3
 
 /* SPI Flash */
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS		0
 #define CONFIG_SF_DEFAULT_CS		0
 #define CONFIG_SF_DEFAULT_SPEED		20000000

+ 0 - 1
include/configs/pfla02.h

@@ -41,7 +41,6 @@
 #define CONFIG_FEC_MXC_PHYADDR		3
 
 /* SPI Flash */
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS		2
 #define CONFIG_SF_DEFAULT_CS		0
 #define CONFIG_SF_DEFAULT_SPEED		20000000

+ 0 - 3
include/configs/tqma6.h

@@ -31,9 +31,6 @@
 
 #define CONFIG_MXC_UART
 
-/* SPI */
-#define CONFIG_MXC_SPI
-
 /* SPI Flash */
 
 #define TQMA6_SPI_FLASH_SECTOR_SIZE	SZ_64K

+ 0 - 6
include/configs/tqma6_wru4.h

@@ -38,10 +38,4 @@
 #define CONFIG_SYS_BOOTCOUNT_ADDR	IRAM_BASE_ADDR
 #define CONFIG_SYS_BOOTCOUNT_BE
 
-/*
- * Remove all unused interfaces / commands that are defined in
- * the common header tqms6.h
- */
-#undef CONFIG_MXC_SPI
-
 #endif /* __CONFIG_TQMA6_WRU4_H */

+ 0 - 1
include/configs/ts4800.h

@@ -47,7 +47,6 @@
  * SPI Configs
  * */
 #define CONFIG_HARD_SPI /* puts SPI: ready */
-#define CONFIG_MXC_SPI /* driver for the SPI controllers*/
 
 /*
  * MMC Configs

+ 0 - 1
include/configs/woodburn_common.h

@@ -43,7 +43,6 @@
 #define CONFIG_SYS_I2C_MXC_I2C2		/* enable I2C bus 2 */
 #define CONFIG_SYS_I2C_MXC_I2C3		/* enable I2C bus 3 */
 #define CONFIG_SYS_SPD_BUS_NUM		0
-#define CONFIG_MXC_SPI
 
 /* PMIC Controller */
 #define CONFIG_POWER

+ 0 - 1
scripts/config_whitelist.txt

@@ -1427,7 +1427,6 @@ CONFIG_MXC_MCI_REGS_BASE
 CONFIG_MXC_NAND_HWECC
 CONFIG_MXC_NAND_IP_REGS_BASE
 CONFIG_MXC_NAND_REGS_BASE
-CONFIG_MXC_SPI
 CONFIG_MXC_UART_BASE
 CONFIG_MXC_USB_FLAGS
 CONFIG_MXC_USB_PORT