Merge branch 'davinci-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / arch / arm / plat-mxc / Kconfig

diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
index 8b0a1ee039fa5bebe5a32605837f4304783f9778..7f7ad6f289bd53383ed5ed952099d62c2a4f52b1 100644 (file)
--- a/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@@ -9,38 +9,43 @@ choice
 config ARCH_MX1
        bool "MX1-based"
        select CPU_ARM920T
 config ARCH_MX1
        bool "MX1-based"
        select CPU_ARM920T

-       select COMMON_CLKDEV
+       select IMX_HAVE_IOMUX_V1

        help
          This enables support for systems based on the Freescale i.MX1 family
 
 config ARCH_MX2
        bool "MX2-based"
        select CPU_ARM926T
        help
          This enables support for systems based on the Freescale i.MX1 family
 
 config ARCH_MX2
        bool "MX2-based"
        select CPU_ARM926T

-       select COMMON_CLKDEV
+       select IMX_HAVE_IOMUX_V1

        help
          This enables support for systems based on the Freescale i.MX2 family
 
 config ARCH_MX25
        bool "MX25-based"
        select CPU_ARM926T
        help
          This enables support for systems based on the Freescale i.MX2 family
 
 config ARCH_MX25
        bool "MX25-based"
        select CPU_ARM926T

-       select COMMON_CLKDEV
+       select ARCH_MXC_IOMUX_V3
+       select HAVE_FB_IMX

        help
          This enables support for systems based on the Freescale i.MX25 family
 
 config ARCH_MX3
        bool "MX3-based"
        select CPU_V6
        help
          This enables support for systems based on the Freescale i.MX25 family
 
 config ARCH_MX3
        bool "MX3-based"
        select CPU_V6

-       select COMMON_CLKDEV

        help
          This enables support for systems based on the Freescale i.MX3 family
 
 config ARCH_MXC91231
        bool "MXC91231-based"
        select CPU_V6
        help
          This enables support for systems based on the Freescale i.MX3 family
 
 config ARCH_MXC91231
        bool "MXC91231-based"
        select CPU_V6

-       select COMMON_CLKDEV

        help
          This enables support for systems based on the Freescale MXC91231 family
 
        help
          This enables support for systems based on the Freescale MXC91231 family
 

+config ARCH_MX5
+       bool "MX5-based"
+       select CPU_V7
+       help
+         This enables support for systems based on the Freescale i.MX51 family
+

 endchoice
 
 source "arch/arm/mach-mx1/Kconfig"
 endchoice
 
 source "arch/arm/mach-mx1/Kconfig"


@@ -48,12 +53,12 @@ source "arch/arm/mach-mx2/Kconfig"
 source "arch/arm/mach-mx3/Kconfig"
 source "arch/arm/mach-mx25/Kconfig"
 source "arch/arm/mach-mxc91231/Kconfig"
 source "arch/arm/mach-mx3/Kconfig"
 source "arch/arm/mach-mx25/Kconfig"
 source "arch/arm/mach-mxc91231/Kconfig"

+source "arch/arm/mach-mx5/Kconfig"

 
 endmenu
 
 config MXC_IRQ_PRIOR
        bool "Use IRQ priority"
 
 endmenu
 
 config MXC_IRQ_PRIOR
        bool "Use IRQ priority"

-       depends on ARCH_MXC

        help
          Select this if you want to use prioritized IRQ handling.
          This feature prevents higher priority ISR to be interrupted
        help
          Select this if you want to use prioritized IRQ handling.
          This feature prevents higher priority ISR to be interrupted


@@ -62,9 +67,16 @@ config MXC_IRQ_PRIOR
          requirements for timing.
          Say N here, unless you have a specialized requirement.
 
          requirements for timing.
          Say N here, unless you have a specialized requirement.
 

+config MXC_TZIC
+       bool "Enable TrustZone Interrupt Controller"
+       depends on ARCH_MX51
+       help
+         This will be automatically selected for all processors
+         containing this interrupt controller.
+         Say N here only if you are really sure.
+

 config MXC_PWM
        tristate "Enable PWM driver"
 config MXC_PWM
        tristate "Enable PWM driver"

-       depends on ARCH_MXC

        select HAVE_PWM
        help
          Enable support for the i.MX PWM controller(s).
        select HAVE_PWM
        help
          Enable support for the i.MX PWM controller(s).


@@ -74,7 +86,9 @@ config MXC_ULPI
 
 config ARCH_HAS_RNGA
        bool
 
 config ARCH_HAS_RNGA
        bool

-       depends on ARCH_MXC
+
+config IMX_HAVE_IOMUX_V1
+       bool

 
 config ARCH_MXC_IOMUX_V3
        bool
 
 config ARCH_MXC_IOMUX_V3
        bool