Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[sfrench/cifs-2.6.git] / arch / arm / mach-mx3 / Kconfig

diff --git a/arch/arm/mach-mx3/Kconfig b/arch/arm/mach-mx3/Kconfig
index e79659e8176ee76c0525123b27cf5b8993d5ae9f..d6235583e979fed2a758375cf4bd6310ee7e8c47 100644 (file)
--- a/arch/arm/mach-mx3/Kconfig
+++ b/arch/arm/mach-mx3/Kconfig
@@ -1,21 +1,40 @@
-menu "MX3 Options"
-       depends on ARCH_MX3
+if ARCH_MX3
+
+config ARCH_MX31
+       bool
+
+config ARCH_MX35
+       bool
+
+comment "MX3 platforms:"
 
 config MACH_MX31ADS
        bool "Support MX31ADS platforms"
+       select ARCH_MX31
        default y
        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
+       select MFD_WM8350_CONFIG_MODE_0
+       select MFD_WM8352_CONFIG_MODE_0
+       help
+         Include support for the Wolfson Microelectronics 1133-EV1 PMU
+         and audio module for the MX31ADS platform.
+
 config MACH_PCM037
-       bool "Support Phytec pcm037 platforms"
+       bool "Support Phytec pcm037 (i.MX31) platforms"
+       select ARCH_MX31
        help
          Include support for Phytec pcm037 platform. This includes
          specific configurations for the board and its peripherals.
 
 config MACH_MX31LITE
        bool "Support MX31 LITEKIT (LogicPD)"
+       select ARCH_MX31
        default n
        help
          Include support for MX31 LITEKIT platform. This includes specific
@@ -23,6 +42,7 @@ config MACH_MX31LITE
 
 config MACH_MX31_3DS
        bool "Support MX31PDK (3DS)"
+       select ARCH_MX31
        default n
        help
          Include support for MX31PDK (3DS) platform. This includes specific
@@ -30,10 +50,18 @@ config MACH_MX31_3DS
 
 config MACH_MX31MOBOARD
        bool "Support mx31moboard platforms (EPFL Mobots group)"
+       select ARCH_MX31
        default n
        help
          Include support for mx31moboard platform. This includes specific
          configurations for the board and its peripherals.
 
-endmenu
+config MACH_QONG
+       bool "Support Dave/DENX QongEVB-LITE platform"
+       select ARCH_MX31
+       default n
+       help
+         Include support for Dave/DENX QongEVB-LITE platform. This includes
+         specific configurations for the board and its peripherals.
 
+endif