Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[sfrench/cifs-2.6.git] / arch / arm / mach-imx / Kconfig
index e7d7b90e2cf8def52ee1b81e77d3c07432bdb7da..52902782cc5f40111395b9bb918968bc7a429713 100644 (file)
@@ -47,371 +47,26 @@ config HAVE_IMX_SRC
        def_bool y if SMP
        select ARCH_HAS_RESET_CONTROLLER
 
-config IMX_HAVE_IOMUX_V1
-       bool
+if ARCH_MULTI_V6
 
-config ARCH_MXC_IOMUX_V3
-       bool
-
-config SOC_IMX21
-       bool
-       select CPU_ARM926T
-       select IMX_HAVE_IOMUX_V1
-       select MXC_AVIC
-
-config SOC_IMX27
-       bool
-       select CPU_ARM926T
-       select IMX_HAVE_IOMUX_V1
-       select MXC_AVIC
-       select PINCTRL_IMX27
+comment "ARM1136 platforms"
 
 config SOC_IMX31
-       bool
+       bool "i.MX31 support"
        select CPU_V6
        select MXC_AVIC
+       help
+         This enables support for Freescale i.MX31 processor
 
 config SOC_IMX35
-       bool
-       select ARCH_MXC_IOMUX_V3
+       bool "i.MX35 support"
        select MXC_AVIC
        select PINCTRL_IMX35
-
-if ARCH_MULTI_V5
-
-comment "MX21 platforms:"
-
-config MACH_MX21ADS
-       bool "MX21ADS platform"
-       select IMX_HAVE_PLATFORM_IMX_FB
-       select IMX_HAVE_PLATFORM_IMX_UART
-       select IMX_HAVE_PLATFORM_MXC_MMC
-       select IMX_HAVE_PLATFORM_MXC_NAND
-       select SOC_IMX21
-       help
-         Include support for MX21ADS platform. This includes specific
-         configurations for the board and its peripherals.
-
-comment "MX27 platforms:"
-
-config MACH_MX27ADS
-       bool "MX27ADS platform"
-       select IMX_HAVE_PLATFORM_IMX_FB
-       select IMX_HAVE_PLATFORM_IMX_I2C
-       select IMX_HAVE_PLATFORM_IMX_UART
-       select IMX_HAVE_PLATFORM_MXC_MMC
-       select IMX_HAVE_PLATFORM_MXC_NAND
-       select IMX_HAVE_PLATFORM_MXC_W1
-       select SOC_IMX27
-       help
-         Include support for MX27ADS platform. This includes specific
-         configurations for the board and its peripherals.
-
-config MACH_MX27_3DS
-       bool "MX27PDK platform"
-       select IMX_HAVE_PLATFORM_FSL_USB2_UDC
-       select IMX_HAVE_PLATFORM_IMX2_WDT
-       select IMX_HAVE_PLATFORM_IMX_FB
-       select IMX_HAVE_PLATFORM_IMX_I2C
-       select IMX_HAVE_PLATFORM_IMX_KEYPAD
-       select IMX_HAVE_PLATFORM_IMX_SSI
-       select IMX_HAVE_PLATFORM_IMX_UART
-       select IMX_HAVE_PLATFORM_MX2_CAMERA
-       select IMX_HAVE_PLATFORM_MXC_EHCI
-       select IMX_HAVE_PLATFORM_MXC_MMC
-       select IMX_HAVE_PLATFORM_SPI_IMX
-       select MXC_DEBUG_BOARD
-       select USB_ULPI_VIEWPORT if USB_ULPI
-       select SOC_IMX27
-       help
-         Include support for MX27PDK platform. This includes specific
-         configurations for the board and its peripherals.
-
-config MACH_IMX27_VISSTRIM_M10
-       bool "Vista Silicon i.MX27 Visstrim_m10"
-       select IMX_HAVE_PLATFORM_GPIO_KEYS
-       select IMX_HAVE_PLATFORM_IMX_I2C
-       select IMX_HAVE_PLATFORM_IMX_SSI
-       select IMX_HAVE_PLATFORM_IMX_UART
-       select IMX_HAVE_PLATFORM_MX2_CAMERA
-       select IMX_HAVE_PLATFORM_MX2_EMMA
-       select IMX_HAVE_PLATFORM_MXC_EHCI
-       select IMX_HAVE_PLATFORM_MXC_MMC
-       select LEDS_GPIO_REGISTER
-       select SOC_IMX27
-       help
-         Include support for Visstrim_m10 platform and its different variants.
-         This includes specific configurations for the board and its
-         peripherals.
-
-config MACH_PCA100
-       bool "Phytec phyCARD-s (pca100)"
-       select IMX_HAVE_PLATFORM_FSL_USB2_UDC
-       select IMX_HAVE_PLATFORM_IMX2_WDT
-       select IMX_HAVE_PLATFORM_IMX_FB
-       select IMX_HAVE_PLATFORM_IMX_I2C
-       select IMX_HAVE_PLATFORM_IMX_SSI
-       select IMX_HAVE_PLATFORM_IMX_UART
-       select IMX_HAVE_PLATFORM_MXC_EHCI
-       select IMX_HAVE_PLATFORM_MXC_MMC
-       select IMX_HAVE_PLATFORM_MXC_NAND
-       select IMX_HAVE_PLATFORM_MXC_W1
-       select IMX_HAVE_PLATFORM_SPI_IMX
-       select USB_ULPI_VIEWPORT if USB_ULPI
-       select SOC_IMX27
-       help
-         Include support for phyCARD-s (aka pca100) platform. This
-         includes specific configurations for the module and its peripherals.
-
-config MACH_IMX27_DT
-       bool "Support i.MX27 platforms from device tree"
-       select SOC_IMX27
-       help
-         Include support for Freescale i.MX27 based platforms
-         using the device tree for discovery
-
-endif
-
-if ARCH_MULTI_V6
-
-comment "MX31 platforms:"
-
-config MACH_MX31ADS
-       bool "Support MX31ADS platforms"
-       default y
-       select IMX_HAVE_PLATFORM_IMX_I2C
-       select IMX_HAVE_PLATFORM_IMX_SSI
-       select IMX_HAVE_PLATFORM_IMX_UART
-       select SOC_IMX31
-       help
-         Include support for MX31ADS platform. This includes specific
-         configurations for the board and its peripherals.
-
-config MACH_MX31ADS_WM1133_EV1
-       bool "Support Wolfson Microelectronics 1133-EV1 module"
-       depends on MACH_MX31ADS
-       depends on MFD_WM8350_I2C
-       depends on REGULATOR_WM8350 = y
        help
-         Include support for the Wolfson Microelectronics 1133-EV1 PMU
-         and audio module for the MX31ADS platform.
-
-config MACH_MX31LILLY
-       bool "Support MX31 LILLY-1131 platforms (INCO startec)"
-       select IMX_HAVE_PLATFORM_IMX_UART
-       select IMX_HAVE_PLATFORM_IPU_CORE
-       select IMX_HAVE_PLATFORM_MXC_EHCI
-       select IMX_HAVE_PLATFORM_MXC_MMC
-       select IMX_HAVE_PLATFORM_SPI_IMX
-       select USB_ULPI_VIEWPORT if USB_ULPI
-       select SOC_IMX31
-       help
-         Include support for mx31 based LILLY1131 modules. This includes
-         specific configurations for the board and its peripherals.
-
-config MACH_MX31LITE
-       bool "Support MX31 LITEKIT (LogicPD)"
-       select IMX_HAVE_PLATFORM_IMX2_WDT
-       select IMX_HAVE_PLATFORM_IMX_UART
-       select IMX_HAVE_PLATFORM_MXC_EHCI
-       select IMX_HAVE_PLATFORM_MXC_MMC
-       select IMX_HAVE_PLATFORM_MXC_NAND
-       select IMX_HAVE_PLATFORM_MXC_RTC
-       select IMX_HAVE_PLATFORM_SPI_IMX
-       select LEDS_GPIO_REGISTER
-       select USB_ULPI_VIEWPORT if USB_ULPI
-       select SOC_IMX31
-       help
-         Include support for MX31 LITEKIT platform. This includes specific
-         configurations for the board and its peripherals.
-
-config MACH_PCM037
-       bool "Support Phytec pcm037 (i.MX31) platforms"
-       select IMX_HAVE_PLATFORM_FSL_USB2_UDC
-       select IMX_HAVE_PLATFORM_IMX2_WDT
-       select IMX_HAVE_PLATFORM_IMX_I2C
-       select IMX_HAVE_PLATFORM_IMX_UART
-       select IMX_HAVE_PLATFORM_IPU_CORE
-       select IMX_HAVE_PLATFORM_MXC_EHCI
-       select IMX_HAVE_PLATFORM_MXC_MMC
-       select IMX_HAVE_PLATFORM_MXC_NAND
-       select IMX_HAVE_PLATFORM_MXC_W1
-       select USB_ULPI_VIEWPORT if USB_ULPI
-       select SOC_IMX31
-       help
-         Include support for Phytec pcm037 platform. This includes
-         specific configurations for the board and its peripherals.
-
-config MACH_PCM037_EET
-       bool "Support pcm037 EET board extensions"
-       depends on MACH_PCM037
-       select IMX_HAVE_PLATFORM_GPIO_KEYS
-       select IMX_HAVE_PLATFORM_SPI_IMX
-       help
-         Add support for PCM037 EET baseboard extensions. If you are using the
-         OLED display with EET, use "video=mx3fb:CMEL-OLED" kernel
-         command-line parameter.
-
-config MACH_MX31_3DS
-       bool "Support MX31PDK (3DS)"
-       select IMX_HAVE_PLATFORM_FSL_USB2_UDC
-       select IMX_HAVE_PLATFORM_IMX2_WDT
-       select IMX_HAVE_PLATFORM_IMX_I2C
-       select IMX_HAVE_PLATFORM_IMX_KEYPAD
-       select IMX_HAVE_PLATFORM_IMX_SSI
-       select IMX_HAVE_PLATFORM_IMX_UART
-       select IMX_HAVE_PLATFORM_IPU_CORE
-       select IMX_HAVE_PLATFORM_MXC_EHCI
-       select IMX_HAVE_PLATFORM_MXC_MMC
-       select IMX_HAVE_PLATFORM_MXC_NAND
-       select IMX_HAVE_PLATFORM_SPI_IMX
-       select MXC_DEBUG_BOARD
-       select USB_ULPI_VIEWPORT if USB_ULPI
-       select SOC_IMX31
-       help
-         Include support for MX31PDK (3DS) platform. This includes specific
-         configurations for the board and its peripherals.
-
-config MACH_MX31_3DS_MXC_NAND_USE_BBT
-       bool "Make the MXC NAND driver use the in flash Bad Block Table"
-       depends on MACH_MX31_3DS
-       depends on MTD_NAND_MXC
-       help
-         Enable this if you want that the MXC NAND driver uses the in flash
-         Bad Block Table to know what blocks are bad instead of scanning the
-         entire flash looking for bad block markers.
-
-config MACH_MX31MOBOARD
-       bool "Support mx31moboard platforms (EPFL Mobots group)"
-       select IMX_HAVE_PLATFORM_FSL_USB2_UDC
-       select IMX_HAVE_PLATFORM_IMX2_WDT
-       select IMX_HAVE_PLATFORM_IMX_I2C
-       select IMX_HAVE_PLATFORM_IMX_SSI
-       select IMX_HAVE_PLATFORM_IMX_UART
-       select IMX_HAVE_PLATFORM_IPU_CORE
-       select IMX_HAVE_PLATFORM_MXC_EHCI
-       select IMX_HAVE_PLATFORM_MXC_MMC
-       select IMX_HAVE_PLATFORM_SPI_IMX
-       select LEDS_GPIO_REGISTER
-       select USB_ULPI_VIEWPORT if USB_ULPI
-       select SOC_IMX31
-       help
-         Include support for mx31moboard platform. This includes specific
-         configurations for the board and its peripherals.
-
-config MACH_QONG
-       bool "Support Dave/DENX QongEVB-LITE platform"
-       select IMX_HAVE_PLATFORM_IMX2_WDT
-       select IMX_HAVE_PLATFORM_IMX_UART
-       select SOC_IMX31
-       help
-         Include support for Dave/DENX QongEVB-LITE platform. This includes
-         specific configurations for the board and its peripherals.
-
-config MACH_ARMADILLO5X0
-       bool "Support Atmark Armadillo-500 Development Base Board"
-       select IMX_HAVE_PLATFORM_GPIO_KEYS
-       select IMX_HAVE_PLATFORM_IMX_I2C
-       select IMX_HAVE_PLATFORM_IMX_UART
-       select IMX_HAVE_PLATFORM_IPU_CORE
-       select IMX_HAVE_PLATFORM_MXC_EHCI
-       select IMX_HAVE_PLATFORM_MXC_MMC
-       select IMX_HAVE_PLATFORM_MXC_NAND
-       select USB_ULPI_VIEWPORT if USB_ULPI
-       select SOC_IMX31
-       help
-         Include support for Atmark Armadillo-500 platform. This includes
-         specific configurations for the board and its peripherals.
-
-config MACH_KZM_ARM11_01
-       bool "Support KZM-ARM11-01(Kyoto Microcomputer)"
-       select IMX_HAVE_PLATFORM_IMX_UART
-       select SOC_IMX31
-       help
-         Include support for KZM-ARM11-01. This includes specific
-         configurations for the board and its peripherals.
-
-config MACH_BUG
-       bool "Support Buglabs BUGBase platform"
-       default y
-       select IMX_HAVE_PLATFORM_IMX_UART
-       select SOC_IMX31
-       help
-         Include support for BUGBase 1.3 platform. This includes specific
-         configurations for the board and its peripherals.
-
-config MACH_IMX31_DT
-       bool "Support i.MX31 platforms from device tree"
-       select SOC_IMX31
-       help
-         Include support for Freescale i.MX31 based platforms
-         using the device tree for discovery.
-
-comment "MX35 platforms:"
-
-config MACH_IMX35_DT
-       bool "Support i.MX35 platforms from device tree"
-       select SOC_IMX35
-       help
-         Include support for Freescale i.MX35 based platforms
-         using the device tree for discovery.
-
-config MACH_PCM043
-       bool "Support Phytec pcm043 (i.MX35) platforms"
-       select IMX_HAVE_PLATFORM_FLEXCAN
-       select IMX_HAVE_PLATFORM_FSL_USB2_UDC
-       select IMX_HAVE_PLATFORM_IMX2_WDT
-       select IMX_HAVE_PLATFORM_IMX_I2C
-       select IMX_HAVE_PLATFORM_IMX_SSI
-       select IMX_HAVE_PLATFORM_IMX_UART
-       select IMX_HAVE_PLATFORM_IPU_CORE
-       select IMX_HAVE_PLATFORM_MXC_EHCI
-       select IMX_HAVE_PLATFORM_MXC_NAND
-       select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
-       select USB_ULPI_VIEWPORT if USB_ULPI
-       select SOC_IMX35
-       help
-         Include support for Phytec pcm043 platform. This includes
-         specific configurations for the board and its peripherals.
-
-config MACH_MX35_3DS
-       bool "Support MX35PDK platform"
-       select IMX_HAVE_PLATFORM_FSL_USB2_UDC
-       select IMX_HAVE_PLATFORM_IMX2_WDT
-       select IMX_HAVE_PLATFORM_IMX_FB
-       select IMX_HAVE_PLATFORM_IMX_I2C
-       select IMX_HAVE_PLATFORM_IMX_UART
-       select IMX_HAVE_PLATFORM_IPU_CORE
-       select IMX_HAVE_PLATFORM_MXC_EHCI
-       select IMX_HAVE_PLATFORM_MXC_NAND
-       select IMX_HAVE_PLATFORM_MXC_RTC
-       select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
-       select MXC_DEBUG_BOARD
-       select SOC_IMX35
-       help
-         Include support for MX35PDK platform. This includes specific
-         configurations for the board and its peripherals.
-
-config MACH_VPR200
-       bool "Support VPR200 platform"
-       select IMX_HAVE_PLATFORM_FSL_USB2_UDC
-       select IMX_HAVE_PLATFORM_GPIO_KEYS
-       select IMX_HAVE_PLATFORM_IMX2_WDT
-       select IMX_HAVE_PLATFORM_IMX_I2C
-       select IMX_HAVE_PLATFORM_IMX_UART
-       select IMX_HAVE_PLATFORM_IPU_CORE
-       select IMX_HAVE_PLATFORM_MXC_EHCI
-       select IMX_HAVE_PLATFORM_MXC_NAND
-       select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
-       select SOC_IMX35
-       help
-         Include support for VPR200 platform. This includes specific
-         configurations for the board and its peripherals.
+         This enables support for Freescale i.MX31 processor
 
 endif
 
-comment "Device tree only"
-
 if ARCH_MULTI_V4T
 
 config SOC_IMX1
@@ -428,12 +83,20 @@ if ARCH_MULTI_V5
 
 config SOC_IMX25
        bool "i.MX25 support"
-       select ARCH_MXC_IOMUX_V3
        select CPU_ARM926T
        select MXC_AVIC
        select PINCTRL_IMX25
        help
          This enables support for Freescale i.MX25 processor
+
+config SOC_IMX27
+       bool "i.MX27 support"
+       select CPU_ARM926T
+       select MXC_AVIC
+       select PINCTRL_IMX27
+       help
+         This enables support for Freescale i.MX27 processor
+
 endif
 
 if ARCH_MULTI_V7
@@ -541,10 +204,10 @@ config SOC_LS1021A
 
 endif
 
-comment "Cortex-A/Cortex-M asymmetric multiprocessing platforms"
-
 if ARCH_MULTI_V7 || ARM_SINGLE_ARMV7M
 
+comment "Cortex-A/Cortex-M asymmetric multiprocessing platforms"
+
 config SOC_IMX7D_CA7
        bool
        select ARM_GIC
@@ -607,6 +270,4 @@ endchoice
 
 endif
 
-source "arch/arm/mach-imx/devices/Kconfig"
-
 endif