Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[pandora-kernel.git] / arch / arm / mach-mxs / Kconfig

diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig
index 8bfc8df..4f6f174 100644 (file)
--- a/arch/arm/mach-mxs/Kconfig
+++ b/arch/arm/mach-mxs/Kconfig
@@ -2,13 +2,18 @@ if ARCH_MXS
 
 source "arch/arm/mach-mxs/devices/Kconfig"
 
+config MXS_OCOTP
+       bool
+
 config SOC_IMX23
        bool
        select CPU_ARM926T
+       select HAVE_PWM
 
 config SOC_IMX28
        bool
        select CPU_ARM926T
+       select HAVE_PWM
 
 comment "MXS platforms:"
 
@@ -16,6 +21,8 @@ config MACH_MX23EVK
        bool "Support MX23EVK Platform"
        select SOC_IMX23
        select MXS_HAVE_AMBA_DUART
+       select MXS_HAVE_PLATFORM_AUART
+       select MXS_HAVE_PLATFORM_MXSFB
        default y
        help
          Include support for MX23EVK platform. This includes specific
@@ -25,10 +32,27 @@ config MACH_MX28EVK
        bool "Support MX28EVK Platform"
        select SOC_IMX28
        select MXS_HAVE_AMBA_DUART
+       select MXS_HAVE_PLATFORM_AUART
        select MXS_HAVE_PLATFORM_FEC
+       select MXS_HAVE_PLATFORM_FLEXCAN
+       select MXS_HAVE_PLATFORM_MXSFB
+       select MXS_OCOTP
        default y
        help
          Include support for MX28EVK platform. This includes specific
          configurations for the board and its peripherals.
 
+config MODULE_TX28
+       bool
+       select SOC_IMX28
+       select MXS_HAVE_AMBA_DUART
+       select MXS_HAVE_PLATFORM_AUART
+       select MXS_HAVE_PLATFORM_FEC
+       select MXS_HAVE_PLATFORM_MXS_I2C
+       select MXS_HAVE_PLATFORM_MXS_PWM
+
+config MACH_TX28
+       bool "Ka-Ro TX28 module"
+       select MODULE_TX28
+
 endif