1 files changed, 79 insertions, 63 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ae0ecdaf353c..492f81344900 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -13,7 +13,7 @@ config ARM
         select RTC_LIB
         select SYS_SUPPORTS_APM_EMULATION
         select GENERIC_ATOMIC64 if (!CPU_32v6K)
-        select HAVE_OPROFILE
+        select HAVE_OPROFILE if (HAVE_PERF_EVENTS)
         select HAVE_ARCH_KGDB
         select HAVE_KPROBES if (!XIP_KERNEL)
         select HAVE_KRETPROBES if (HAVE_KPROBES)
@@ -21,6 +21,7 @@ config ARM
         select HAVE_GENERIC_DMA_COHERENT
         select HAVE_KERNEL_GZIP
         select HAVE_KERNEL_LZO
+        select HAVE_KERNEL_LZMA
         select HAVE_PERF_EVENTS
         select PERF_USE_VMALLOC
         help
@@ -42,6 +43,11 @@ config GENERIC_GPIO
 
 config GENERIC_TIME
         bool
+        default y
+
+config ARCH_USES_GETTIMEOFFSET
+        bool
+        default n
 
 config GENERIC_CLOCKEVENTS
         bool
@@ -175,28 +181,6 @@ config ARM_L1_CACHE_SHIFT_6
         help
           Setting ARM L1 cache line size to 64 Bytes.
 
-if OPROFILE
-
-config OPROFILE_ARMV6
-        def_bool y
-        depends on CPU_V6 && !SMP
-        select OPROFILE_ARM11_CORE
-
-config OPROFILE_MPCORE
-        def_bool y
-        depends on CPU_V6 && SMP
-        select OPROFILE_ARM11_CORE
-
-config OPROFILE_ARM11_CORE
-        bool
-
-config OPROFILE_ARMV7
-        def_bool y
-        depends on CPU_V7 && !SMP
-        bool
-
-endif
-
 config VECTORS_BASE
         hex
         default 0xffff0000 if MMU || CPU_HIGH_VECTOR
@@ -231,6 +215,7 @@ config ARCH_AAEC2000
         select CPU_ARM920T
         select ARM_AMBA
         select HAVE_CLK
+        select ARCH_USES_GETTIMEOFFSET
         help
           This enables support for systems based on the Agilent AAEC-2000
 
@@ -238,21 +223,24 @@ config ARCH_INTEGRATOR
         bool "ARM Ltd. Integrator family"
         select ARM_AMBA
         select ARCH_HAS_CPUFREQ
-        select HAVE_CLK
         select COMMON_CLKDEV
-        select ICST525
+        select ICST
+        select GENERIC_TIME
+        select GENERIC_CLOCKEVENTS
+        select PLAT_VERSATILE
         help
           Support for ARM's Integrator platform.
 
 config ARCH_REALVIEW
         bool "ARM Ltd. RealView family"
         select ARM_AMBA
-        select HAVE_CLK
         select COMMON_CLKDEV
-        select ICST307
+        select ICST
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
         select ARCH_WANT_OPTIONAL_GPIOLIB
+        select PLAT_VERSATILE
+        select ARM_TIMER_SP804
         select GPIO_PL061 if GPIOLIB
         help
           This enables support for ARM Ltd RealView boards.
@@ -261,20 +249,35 @@ config ARCH_VERSATILE
         bool "ARM Ltd. Versatile family"
         select ARM_AMBA
         select ARM_VIC
-        select HAVE_CLK
         select COMMON_CLKDEV
-        select ICST307
+        select ICST
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
         select ARCH_WANT_OPTIONAL_GPIOLIB
+        select PLAT_VERSATILE
+        select ARM_TIMER_SP804
         help
           This enables support for ARM Ltd Versatile board.
 
+config ARCH_VEXPRESS
+        bool "ARM Ltd. Versatile Express family"
+        select ARCH_WANT_OPTIONAL_GPIOLIB
+        select ARM_AMBA
+        select ARM_TIMER_SP804
+        select COMMON_CLKDEV
+        select GENERIC_CLOCKEVENTS
+        select GENERIC_TIME
+        select HAVE_CLK
+        select ICST
+        select PLAT_VERSATILE
+        help
+          This enables support for the ARM Ltd Versatile Express boards.
+
 config ARCH_AT91
         bool "Atmel AT91"
-        select GENERIC_GPIO
         select ARCH_REQUIRE_GPIOLIB
         select HAVE_CLK
+        select ARCH_USES_GETTIMEOFFSET
         help
           This enables support for systems based on the Atmel AT91RM9200,
           AT91SAM9 and AT91CAP9 processors.
@@ -294,6 +297,7 @@ config ARCH_BCMRING
 config ARCH_CLPS711X
         bool "Cirrus Logic CLPS711x/EP721x-based"
         select CPU_ARM720T
+        select ARCH_USES_GETTIMEOFFSET
         help
           Support for Cirrus Logic 711x/721x based boards.
 
@@ -309,8 +313,8 @@ config ARCH_CNS3XXX
 config ARCH_GEMINI
         bool "Cortina Systems Gemini"
         select CPU_FA526
-        select GENERIC_GPIO
         select ARCH_REQUIRE_GPIOLIB
+        select ARCH_USES_GETTIMEOFFSET
         help
           Support for the Cortina Systems Gemini family SoCs
 
@@ -319,6 +323,7 @@ config ARCH_EBSA110
         select CPU_SA110
         select ISA
         select NO_IOPORT
+        select ARCH_USES_GETTIMEOFFSET
         help
           This is an evaluation board for the StrongARM processor available
           from Digital. It has limited hardware on-board, including an
@@ -330,11 +335,10 @@ config ARCH_EP93XX
         select CPU_ARM920T
         select ARM_AMBA
         select ARM_VIC
-        select GENERIC_GPIO
-        select HAVE_CLK
         select COMMON_CLKDEV
         select ARCH_REQUIRE_GPIOLIB
         select ARCH_HAS_HOLES_MEMORYMODEL
+        select ARCH_USES_GETTIMEOFFSET
         help
           This enables support for the Cirrus EP93xx series of CPUs.
 
@@ -342,6 +346,7 @@ config ARCH_FOOTBRIDGE
         bool "FootBridge"
         select CPU_SA110
         select FOOTBRIDGE
+        select ARCH_USES_GETTIMEOFFSET
         help
           Support for systems based on the DC21285 companion chip
           ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
@@ -351,7 +356,6 @@ config ARCH_MXC
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
         select ARCH_REQUIRE_GPIOLIB
-        select HAVE_CLK
         select COMMON_CLKDEV
         help
           Support for Freescale MXC/iMX-based family of processors
@@ -359,12 +363,10 @@ config ARCH_MXC
 config ARCH_STMP3XXX
         bool "Freescale STMP3xxx"
         select CPU_ARM926T
-        select HAVE_CLK
         select COMMON_CLKDEV
         select ARCH_REQUIRE_GPIOLIB
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
-        select GENERIC_GPIO
         select USB_ARCH_HAS_EHCI
         help
           Support for systems based on the Freescale 3xxx CPUs.
@@ -382,6 +384,7 @@ config ARCH_H720X
         bool "Hynix HMS720x-based"
         select CPU_ARM720T
         select ISA_DMA_API
+        select ARCH_USES_GETTIMEOFFSET
         help
           This enables support for systems based on the Hynix HMS720x
 
@@ -402,7 +405,6 @@ config ARCH_IOP32X
         select CPU_XSCALE
         select PLAT_IOP
         select PCI
-        select GENERIC_GPIO
         select ARCH_REQUIRE_GPIOLIB
         help
           Support for Intel's 80219 and IOP32X (XScale) family of
@@ -414,7 +416,6 @@ config ARCH_IOP33X
         select CPU_XSCALE
         select PLAT_IOP
         select PCI
-        select GENERIC_GPIO
         select ARCH_REQUIRE_GPIOLIB
         help
           Support for Intel's IOP33X (XScale) family of processors.
@@ -424,6 +425,7 @@ config ARCH_IXP23XX
         depends on MMU
         select CPU_XSC3
         select PCI
+        select ARCH_USES_GETTIMEOFFSET
         help
           Support for Intel's IXP23xx (XScale) family of processors.
 
@@ -432,6 +434,7 @@ config ARCH_IXP2000
         depends on MMU
         select CPU_XSCALE
         select PCI
+        select ARCH_USES_GETTIMEOFFSET
         help
           Support for Intel's IXP2400/2800 (XScale) family of processors.
 
@@ -450,6 +453,7 @@ config ARCH_L7200
         bool "LinkUp-L7200"
         select CPU_ARM720T
         select FIQ
+        select ARCH_USES_GETTIMEOFFSET
         help
           Say Y here if you intend to run this kernel on a LinkUp Systems
           L7200 Software Development Board which uses an ARM720T processor.
@@ -463,7 +467,6 @@ config ARCH_L7200
 config ARCH_DOVE
         bool "Marvell Dove"
         select PCI
-        select GENERIC_GPIO
         select ARCH_REQUIRE_GPIOLIB
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
@@ -475,7 +478,6 @@ config ARCH_KIRKWOOD
         bool "Marvell Kirkwood"
         select CPU_FEROCEON
         select PCI
-        select GENERIC_GPIO
         select ARCH_REQUIRE_GPIOLIB
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
@@ -497,7 +499,6 @@ config ARCH_MV78XX0
         bool "Marvell MV78xx0"
         select CPU_FEROCEON
         select PCI
-        select GENERIC_GPIO
         select ARCH_REQUIRE_GPIOLIB
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
@@ -511,7 +512,6 @@ config ARCH_ORION5X
         depends on MMU
         select CPU_FEROCEON
         select PCI
-        select GENERIC_GPIO
         select ARCH_REQUIRE_GPIOLIB
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
@@ -524,9 +524,7 @@ config ARCH_ORION5X
 config ARCH_MMP
         bool "Marvell PXA168/910/MMP2"
         depends on MMU
-        select GENERIC_GPIO
         select ARCH_REQUIRE_GPIOLIB
-        select HAVE_CLK
         select COMMON_CLKDEV
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
@@ -538,8 +536,8 @@ config ARCH_MMP
 config ARCH_KS8695
         bool "Micrel/Kendin KS8695"
         select CPU_ARM922T
-        select GENERIC_GPIO
-        select ARCH_REQUIRE_GPIOLIB
+        select ARCH_REQUIRE_GPIOLIB
+        select ARCH_USES_GETTIMEOFFSET
         help
           Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based
           System-on-Chip devices.
@@ -561,8 +559,6 @@ config ARCH_W90X900
         bool "Nuvoton W90X900 CPU"
         select CPU_ARM926T
         select ARCH_REQUIRE_GPIOLIB
-        select GENERIC_GPIO
-        select HAVE_CLK
         select COMMON_CLKDEV
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
@@ -578,7 +574,6 @@ config ARCH_W90X900
 config ARCH_NUC93X
         bool "Nuvoton NUC93X CPU"
         select CPU_ARM926T
-        select HAVE_CLK
         select COMMON_CLKDEV
         help
           Support for Nuvoton (Winbond logic dept.) NUC93X MCU,The NUC93X is a
@@ -587,8 +582,8 @@ config ARCH_NUC93X
 config ARCH_PNX4008
         bool "Philips Nexperia PNX4008 Mobile"
         select CPU_ARM926T
-        select HAVE_CLK
         select COMMON_CLKDEV
+        select ARCH_USES_GETTIMEOFFSET
         help
           This enables support for Philips PNX4008 mobile platform.
 
@@ -597,8 +592,6 @@ config ARCH_PXA
         depends on MMU
         select ARCH_MTD_XIP
         select ARCH_HAS_CPUFREQ
-        select GENERIC_GPIO
-        select HAVE_CLK
         select COMMON_CLKDEV
         select ARCH_REQUIRE_GPIOLIB
         select GENERIC_TIME
@@ -635,6 +628,7 @@ config ARCH_RPC
         select ISA_DMA_API
         select NO_IOPORT
         select ARCH_SPARSEMEM_ENABLE
+        select ARCH_USES_GETTIMEOFFSET
         help
           On the Acorn Risc-PC, Linux can support the internal IDE disk and
           CD-ROM interface, serial and parallel port, and the floppy drive.
@@ -647,7 +641,6 @@ config ARCH_SA1100
         select ARCH_MTD_XIP
         select ARCH_HAS_CPUFREQ
         select CPU_FREQ
-        select GENERIC_GPIO
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
         select HAVE_CLK
@@ -661,6 +654,7 @@ config ARCH_S3C2410
         select GENERIC_GPIO
         select ARCH_HAS_CPUFREQ
         select HAVE_CLK
+        select ARCH_USES_GETTIMEOFFSET
         help
           Samsung S3C2410X CPU based systems, such as the Simtec Electronics
           BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
@@ -674,10 +668,10 @@ config ARCH_S3C64XX
         bool "Samsung S3C64XX"
         select PLAT_SAMSUNG
         select CPU_V6
-        select GENERIC_GPIO
         select ARM_VIC
         select HAVE_CLK
         select NO_IOPORT
+        select ARCH_USES_GETTIMEOFFSET
         select ARCH_HAS_CPUFREQ
         select ARCH_REQUIRE_GPIOLIB
         select SAMSUNG_CLKSRC
@@ -734,6 +728,7 @@ config ARCH_SHARK
         select ISA_DMA
         select ZONE_DMA
         select PCI
+        select ARCH_USES_GETTIMEOFFSET
         help
           Support for the StrongARM based Digital DNARD machine, also known
           as "Shark" (<http://www.shark-linux.de/shark.html>).
@@ -743,6 +738,7 @@ config ARCH_LH7A40X
         select CPU_ARM922T
         select ARCH_DISCONTIGMEM_ENABLE if !LH7A40X_CONTIGMEM
         select ARCH_SPARSEMEM_ENABLE if !LH7A40X_CONTIGMEM
+        select ARCH_USES_GETTIMEOFFSET
         help
           Say Y here for systems based on one of the Sharp LH7A40X
           System on a Chip processors.  These CPUs include an ARM922T
@@ -758,7 +754,6 @@ config ARCH_U300
         select ARM_VIC
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
-        select HAVE_CLK
         select COMMON_CLKDEV
         select GENERIC_GPIO
         help
@@ -771,6 +766,7 @@ config ARCH_U8500
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
         select COMMON_CLKDEV
+        select ARCH_REQUIRE_GPIOLIB
         help
           Support for ST-Ericsson's Ux500 architecture
 
@@ -779,11 +775,9 @@ config ARCH_NOMADIK
         select ARM_AMBA
         select ARM_VIC
         select CPU_ARM926T
-        select HAVE_CLK
         select COMMON_CLKDEV
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
-        select GENERIC_GPIO
         select ARCH_REQUIRE_GPIOLIB
         help
           Support for the Nomadik platform by ST-Ericsson
@@ -793,9 +787,7 @@ config ARCH_DAVINCI
         select CPU_ARM926T
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
-        select GENERIC_GPIO
         select ARCH_REQUIRE_GPIOLIB
-        select HAVE_CLK
         select ZONE_DMA
         select HAVE_IDE
         select COMMON_CLKDEV
@@ -806,7 +798,6 @@ config ARCH_DAVINCI
 
 config ARCH_OMAP
         bool "TI OMAP"
-        select GENERIC_GPIO
         select HAVE_CLK
         select ARCH_REQUIRE_GPIOLIB
         select ARCH_HAS_CPUFREQ
@@ -816,6 +807,17 @@ config ARCH_OMAP
         help
           Support for TI's OMAP platform (OMAP1 and OMAP2).
 
+config PLAT_SPEAR
+        bool "ST SPEAr"
+        select ARM_AMBA
+        select ARCH_REQUIRE_GPIOLIB
+        select COMMON_CLKDEV
+        select GENERIC_CLOCKEVENTS
+        select GENERIC_TIME
+        select HAVE_CLK
+        help
+          Support for ST's SPEAr platform (SPEAr3xx, SPEAr6xx and SPEAr13xx).
+
 endchoice
 
 #
@@ -903,6 +905,7 @@ source "arch/arm/plat-samsung/Kconfig"
 source "arch/arm/plat-s3c24xx/Kconfig"
 source "arch/arm/plat-s5p/Kconfig"
 source "arch/arm/plat-s5pc1xx/Kconfig"
+source "arch/arm/plat-spear/Kconfig"
 
 if ARCH_S3C2410
 source "arch/arm/mach-s3c2400/Kconfig"
@@ -937,6 +940,8 @@ source "arch/arm/mach-ux500/Kconfig"
 
 source "arch/arm/mach-versatile/Kconfig"
 
+source "arch/arm/mach-vexpress/Kconfig"
+
 source "arch/arm/mach-w90x900/Kconfig"
 
 # Definitions to make life easier
@@ -954,6 +959,12 @@ config PLAT_ORION
 config PLAT_PXA
         bool
 
+config PLAT_VERSATILE
+        bool
+
+config ARM_TIMER_SP804
+        bool
+
 source arch/arm/mm/Kconfig
 
 config IWMMXT
@@ -1082,6 +1093,10 @@ config PCI
           your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
           VESA. If you have PCI, say Y, otherwise N.
 
+config PCI_DOMAINS
+        bool
+        depends on PCI
+
 config PCI_SYSCALL
         def_bool PCI
 
@@ -1110,10 +1125,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 || ARCH_OMAP4 || ARCH_U8500)
+                 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 ||\
+                 ARCH_U8500 || ARCH_VEXPRESS_CA9X4)
         depends on GENERIC_CLOCKEVENTS
         select USE_GENERIC_SMP_HELPERS
-        select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500)
+        select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)
         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
@@ -1294,7 +1310,7 @@ config HIGHPTE
 
 config HW_PERF_EVENTS
         bool "Enable hardware performance counter support for perf events"
-        depends on PERF_EVENTS && CPU_HAS_PMU && (CPU_V6 || CPU_V7)
+        depends on PERF_EVENTS && CPU_HAS_PMU
         default y
         help
           Enable hardware performance counter support for perf events. If