1 files changed, 102 insertions, 99 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ceb549ca9635..c857111ab964 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -34,15 +34,12 @@ config SYS_SUPPORTS_APM_EMULATION
 
 config GENERIC_GPIO
         bool
-        default n
 
 config GENERIC_TIME
         bool
-        default n
 
 config GENERIC_CLOCKEVENTS
         bool
-        default n
 
 config GENERIC_CLOCKEVENTS_BROADCAST
         bool
@@ -55,7 +52,6 @@ config MMU
 
 config NO_IOPORT
         bool
-        default n
 
 config EISA
         bool
@@ -126,11 +122,9 @@ config RWSEM_XCHGADD_ALGORITHM
 
 config ARCH_HAS_ILOG2_U32
         bool
-        default n
 
 config ARCH_HAS_ILOG2_U64
         bool
-        default n
 
 config GENERIC_HWEIGHT
         bool
@@ -253,6 +247,14 @@ config ARCH_CLPS711X
         help
           Support for Cirrus Logic 711x/721x based boards.
 
+config ARCH_GEMINI
+        bool "Cortina Systems Gemini"
+        select CPU_FA526
+        select GENERIC_GPIO
+        select ARCH_REQUIRE_GPIOLIB
+        help
+          Support for the Cortina Systems Gemini family SoCs
+
 config ARCH_EBSA110
         bool "EBSA-110"
         select CPU_SA110
@@ -277,14 +279,6 @@ config ARCH_EP93XX
         help
           This enables support for the Cirrus EP93xx series of CPUs.
 
-config ARCH_GEMINI
-        bool "Cortina Systems Gemini"
-        select CPU_FA526
-        select GENERIC_GPIO
-        select ARCH_REQUIRE_GPIOLIB
-        help
-          Support for the Cortina Systems Gemini family SoCs
-
 config ARCH_FOOTBRIDGE
         bool "FootBridge"
         select CPU_SA110
@@ -293,6 +287,17 @@ config ARCH_FOOTBRIDGE
           Support for systems based on the DC21285 companion chip
           ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
 
+config ARCH_MXC
+        bool "Freescale MXC/iMX-based"
+        select GENERIC_TIME
+        select GENERIC_CLOCKEVENTS
+        select ARCH_MTD_XIP
+        select GENERIC_GPIO
+        select ARCH_REQUIRE_GPIOLIB
+        select HAVE_CLK
+        help
+          Support for Freescale MXC/iMX-based family of processors
+
 config ARCH_NETX
         bool "Hilscher NetX based"
         select CPU_ARM926T
@@ -309,15 +314,6 @@ config ARCH_H720X
         help
           This enables support for systems based on the Hynix HMS720x
 
-config ARCH_IMX
-        bool "IMX"
-        select CPU_ARM920T
-        select GENERIC_GPIO
-        select GENERIC_TIME
-        select GENERIC_CLOCKEVENTS
-        help
-          Support for Motorola's i.MX family of processors (MX1, MXL).
-
 config ARCH_IOP13XX
         bool "IOP13xx-based"
         depends on MMU
@@ -398,6 +394,7 @@ config ARCH_KIRKWOOD
         select CPU_FEROCEON
         select PCI
         select GENERIC_GPIO
+        select ARCH_REQUIRE_GPIOLIB
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
         select PLAT_ORION
@@ -405,28 +402,6 @@ config ARCH_KIRKWOOD
           Support for the following Marvell Kirkwood series SoCs:
           88F6180, 88F6192 and 88F6281.
 
-config ARCH_KS8695
-        bool "Micrel/Kendin KS8695"
-        select CPU_ARM922T
-        select GENERIC_GPIO
-        select ARCH_REQUIRE_GPIOLIB
-        help
-          Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based
-          System-on-Chip devices.
-
-config ARCH_NS9XXX
-        bool "NetSilicon NS9xxx"
-        select CPU_ARM926T
-        select GENERIC_GPIO
-        select GENERIC_TIME
-        select GENERIC_CLOCKEVENTS
-        select HAVE_CLK
-        help
-          Say Y here if you intend to run this kernel on a NetSilicon NS9xxx
-          System.
-
-          <http://www.digi.com/products/microprocessors/index.jsp>
-
 config ARCH_LOKI
         bool "Marvell Loki (88RC8480)"
         select CPU_FEROCEON
@@ -441,6 +416,7 @@ config ARCH_MV78XX0
         select CPU_FEROCEON
         select PCI
         select GENERIC_GPIO
+        select ARCH_REQUIRE_GPIOLIB
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
         select PLAT_ORION
@@ -448,23 +424,13 @@ config ARCH_MV78XX0
           Support for the following Marvell MV78xx0 series SoCs:
           MV781x0, MV782x0.
 
-config ARCH_MXC
-        bool "Freescale MXC/iMX-based"
-        select GENERIC_TIME
-        select GENERIC_CLOCKEVENTS
-        select ARCH_MTD_XIP
-        select GENERIC_GPIO
-        select ARCH_REQUIRE_GPIOLIB
-        select HAVE_CLK
-        help
-          Support for Freescale MXC/iMX-based family of processors
-
 config ARCH_ORION5X
         bool "Marvell Orion"
         depends on MMU
         select CPU_FEROCEON
         select PCI
         select GENERIC_GPIO
+        select ARCH_REQUIRE_GPIOLIB
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
         select PLAT_ORION
@@ -473,6 +439,52 @@ config ARCH_ORION5X
           Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182),
           Orion-2 (5281), Orion-1-90 (6183).
 
+config ARCH_MMP
+        bool "Marvell PXA168/910"
+        depends on MMU
+        select GENERIC_GPIO
+        select ARCH_REQUIRE_GPIOLIB
+        select HAVE_CLK
+        select COMMON_CLKDEV
+        select GENERIC_TIME
+        select GENERIC_CLOCKEVENTS
+        select TICK_ONESHOT
+        select PLAT_PXA
+        help
+          Support for Marvell's PXA168/910 processor line.
+
+config ARCH_KS8695
+        bool "Micrel/Kendin KS8695"
+        select CPU_ARM922T
+        select GENERIC_GPIO
+        select ARCH_REQUIRE_GPIOLIB
+        help
+          Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based
+          System-on-Chip devices.
+
+config ARCH_NS9XXX
+        bool "NetSilicon NS9xxx"
+        select CPU_ARM926T
+        select GENERIC_GPIO
+        select GENERIC_TIME
+        select GENERIC_CLOCKEVENTS
+        select HAVE_CLK
+        help
+          Say Y here if you intend to run this kernel on a NetSilicon NS9xxx
+          System.
+
+          <http://www.digi.com/products/microprocessors/index.jsp>
+
+config ARCH_W90X900
+        bool "Nuvoton W90X900 CPU"
+        select CPU_ARM926T
+        select ARCH_REQUIRE_GPIOLIB
+        select GENERIC_GPIO
+        select COMMON_CLKDEV
+        help
+                Support for Nuvoton (Winbond logic dept.) ARM9 processor,You
+                can login www.mcuos.com or www.nuvoton.com to know more.
+
 config ARCH_PNX4008
         bool "Philips Nexperia PNX4008 Mobile"
         select CPU_ARM926T
@@ -495,19 +507,16 @@ config ARCH_PXA
         help
           Support for Intel/Marvell's PXA2xx/PXA3xx processor line.
 
-config ARCH_MMP
-        bool "Marvell PXA168/910"
-        depends on MMU
-        select GENERIC_GPIO
-        select ARCH_REQUIRE_GPIOLIB
-        select HAVE_CLK
-        select COMMON_CLKDEV
+config ARCH_MSM
+        bool "Qualcomm MSM"
+        select CPU_V6
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
-        select TICK_ONESHOT
-        select PLAT_PXA
         help
-          Support for Marvell's PXA168/910 processor line.
+          Support for Qualcomm MSM7K based systems.  This runs on the ARM11
+          apps processor of the MSM7K and depends on a shared memory
+          interface to the ARM9 modem processor which runs the baseband stack
+          and controls some vital subsystems (clock and power control, etc).
 
 config ARCH_RPC
         bool "RiscPC"
@@ -587,6 +596,7 @@ config ARCH_DAVINCI
         select ZONE_DMA
         select HAVE_IDE
         select COMMON_CLKDEV
+        select GENERIC_ALLOCATOR
         help
           Support for TI's DaVinci platform.
 
@@ -600,24 +610,6 @@ config ARCH_OMAP
         help
           Support for TI's OMAP platform (OMAP1 and OMAP2).
 
-config ARCH_MSM
-        bool "Qualcomm MSM"
-        select CPU_V6
-        select GENERIC_TIME
-        select GENERIC_CLOCKEVENTS
-        help
-          Support for Qualcomm MSM7K based systems.  This runs on the ARM11
-          apps processor of the MSM7K and depends on a shared memory
-          interface to the ARM9 modem processor which runs the baseband stack
-          and controls some vital subsystems (clock and power control, etc).
-
-config ARCH_W90X900
-        bool "Nuvoton W90X900 CPU"
-        select CPU_ARM926T
-        help
-                Support for Nuvoton (Winbond logic dept.) ARM9 processor,You
-                can login www.mcuos.com or www.nuvoton.com to know more.
-
 endchoice
 
 source "arch/arm/mach-clps711x/Kconfig"
@@ -683,8 +675,6 @@ endif
 
 source "arch/arm/mach-lh7a40x/Kconfig"
 
-source "arch/arm/mach-imx/Kconfig"
-
 source "arch/arm/mach-h720x/Kconfig"
 
 source "arch/arm/mach-versatile/Kconfig"
@@ -859,8 +849,11 @@ source "kernel/time/Kconfig"
 
 config SMP
         bool "Symmetric Multi-Processing (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX)
+        depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP ||\
+                 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4)
+        depends on GENERIC_CLOCKEVENTS
         select USE_GENERIC_SMP_HELPERS
+        select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4)
         help
           This enables support for systems with more than one CPU. If you have
           a system with only one CPU, like most personal computers, say N. If
@@ -878,6 +871,18 @@ config SMP
 
           If you don't know what to do here, say N.
 
+config HAVE_ARM_SCU
+        bool
+        depends on SMP
+        help
+          This option enables support for the ARM system coherency unit
+
+config HAVE_ARM_TWD
+        bool
+        depends on SMP
+        help
+          This options enables support for the ARM timer and watchdog unit
+
 choice
         prompt "Memory split"
         default VMSPLIT_3G
@@ -916,8 +921,10 @@ config HOTPLUG_CPU
 
 config LOCAL_TIMERS
         bool "Use local timer interrupts"
-        depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || REALVIEW_EB_A9MP || MACH_REALVIEW_PBX)
+        depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || \
+                REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4)
         default y
+        select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_OMAP4)
         help
           Enable support for local timers on SMP platforms, rather then the
           legacy IPI broadcast method.  Local timers allows the system
@@ -979,7 +986,6 @@ config OABI_COMPAT
 
 config ARCH_HAS_HOLES_MEMORYMODEL
         bool
-        default n
 
 # Discontigmem is deprecated
 config ARCH_DISCONTIGMEM_ENABLE
@@ -1022,7 +1028,7 @@ source "mm/Kconfig"
 config LEDS
         bool "Timer and CPU usage LEDs"
         depends on ARCH_CDB89712 || ARCH_EBSA110 || \
-                   ARCH_EBSA285 || ARCH_IMX || ARCH_INTEGRATOR || \
+                   ARCH_EBSA285 || ARCH_INTEGRATOR || \
                    ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \
                    ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
                    ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \
@@ -1188,7 +1194,7 @@ endmenu
 
 menu "CPU Power Management"
 
-if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA)
+if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_PXA)
 
 source "drivers/cpufreq/Kconfig"
 
@@ -1213,14 +1219,11 @@ config CPU_FREQ_INTEGRATOR
 
           If in doubt, say Y.
 
-config CPU_FREQ_IMX
-        tristate "CPUfreq driver for i.MX CPUs"
-        depends on ARCH_IMX && CPU_FREQ
-        default n
-        help
-          This enables the CPUfreq driver for i.MX CPUs.
-
-          If in doubt, say N.
+config CPU_FREQ_PXA
+        bool
+        depends on CPU_FREQ && ARCH_PXA && PXA25x
+        default y
+        select CPU_FREQ_DEFAULT_GOV_USERSPACE
 
 endif