1 files changed, 80 insertions, 52 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 67874b82a4ed..13b739469c51 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -4,6 +4,7 @@ config ARM
         select ARCH_BINFMT_ELF_RANDOMIZE_PIE
         select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
         select ARCH_HAVE_CUSTOM_GPIO_H
+        select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
         select ARCH_WANT_IPC_PARSE_VERSION
         select BUILDTIME_EXTABLE_SORT if MMU
         select CPU_PM if (SUSPEND || CPU_IDLE)
@@ -36,7 +37,6 @@ config ARM
         select HAVE_GENERIC_HARDIRQS
         select HAVE_HW_BREAKPOINT if (PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7))
         select HAVE_IDE if PCI || ISA || PCMCIA
-        select HAVE_IRQ_WORK
         select HAVE_KERNEL_GZIP
         select HAVE_KERNEL_LZMA
         select HAVE_KERNEL_LZO
@@ -56,6 +56,8 @@ config ARM
         select HAVE_MOD_ARCH_SPECIFIC if ARM_UNWIND
         select MODULES_USE_ELF_REL
         select CLONE_BACKWARDS
+        select OLD_SIGSUSPEND3
+        select OLD_SIGACTION
         help
           The ARM series is a line of low-power-consumption RISC chip designs
           licensed by ARM Ltd and targeted at embedded applications and
@@ -75,6 +77,27 @@ config ARM_DMA_USE_IOMMU
         select ARM_HAS_SG_CHAIN
         select NEED_SG_DMA_LENGTH
 
+if ARM_DMA_USE_IOMMU
+
+config ARM_DMA_IOMMU_ALIGNMENT
+        int "Maximum PAGE_SIZE order of alignment for DMA IOMMU buffers"
+        range 4 9
+        default 8
+        help
+          DMA mapping framework by default aligns all buffers to the smallest
+          PAGE_SIZE order which is greater than or equal to the requested buffer
+          size. This works well for buffers up to a few hundreds kilobytes, but
+          for larger buffers it just a waste of address space. Drivers which has
+          relatively small addressing window (like 64Mib) might run out of
+          virtual space with just a few allocations.
+
+          With this parameter you can specify the maximum PAGE_SIZE order for
+          DMA IOMMU buffers. Larger buffers will be aligned only to this
+          specified order. The order is expressed as a power of two multiplied
+          by the PAGE_SIZE.
+
+endif
+
 config HAVE_PWM
         bool
 
@@ -261,7 +284,8 @@ config MMU
 #
 choice
         prompt "ARM system type"
-        default ARCH_MULTIPLATFORM
+        default ARCH_VERSATILE if !MMU
+        default ARCH_MULTIPLATFORM if MMU
 
 config ARCH_MULTIPLATFORM
         bool "Allow multiple platforms to be selected"
@@ -344,10 +368,10 @@ config ARCH_BCM2835
         select ARM_ERRATA_411920
         select ARM_TIMER_SP804
         select CLKDEV_LOOKUP
+        select CLKSRC_OF
         select COMMON_CLK
         select CPU_V6
         select GENERIC_CLOCKEVENTS
-        select GENERIC_GPIO
         select MULTI_IRQ_HANDLER
         select PINCTRL
         select PINCTRL_BCM2835
@@ -393,6 +417,7 @@ config ARCH_GEMINI
 config ARCH_SIRF
         bool "CSR SiRF"
         select ARCH_REQUIRE_GPIOLIB
+        select AUTO_ZRELADDR
         select COMMON_CLK
         select GENERIC_CLOCKEVENTS
         select GENERIC_IRQ_CHIP
@@ -530,7 +555,6 @@ config ARCH_IXP4XX
 config ARCH_DOVE
         bool "Marvell Dove"
         select ARCH_REQUIRE_GPIOLIB
-        select COMMON_CLK_DOVE
         select CPU_V7
         select GENERIC_CLOCKEVENTS
         select MIGHT_HAVE_PCI
@@ -640,11 +664,12 @@ config ARCH_LPC32XX
 config ARCH_TEGRA
         bool "NVIDIA Tegra"
         select ARCH_HAS_CPUFREQ
+        select ARCH_REQUIRE_GPIOLIB
         select CLKDEV_LOOKUP
         select CLKSRC_MMIO
+        select CLKSRC_OF
         select COMMON_CLK
         select GENERIC_CLOCKEVENTS
-        select GENERIC_GPIO
         select HAVE_CLK
         select HAVE_SMP
         select MIGHT_HAVE_CACHE_L2X0
@@ -698,6 +723,7 @@ config ARCH_SHMOBILE
         select MULTI_IRQ_HANDLER
         select NEED_MACH_MEMORY_H
         select NO_IOPORT
+        select PINCTRL
         select PM_GENERIC_DOMAINS if PM
         select SPARSE_IRQ
         help
@@ -716,6 +742,7 @@ config ARCH_RPC
         select NEED_MACH_IO_H
         select NEED_MACH_MEMORY_H
         select NO_IOPORT
+        select VIRT_TO_BUS
         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.
@@ -744,7 +771,6 @@ config ARCH_S3C24XX
         select ARCH_HAS_CPUFREQ
         select ARCH_USES_GETTIMEOFFSET
         select CLKDEV_LOOKUP
-        select GENERIC_GPIO
         select HAVE_CLK
         select HAVE_S3C2410_I2C if I2C
         select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@ -787,7 +813,6 @@ config ARCH_S5P64X0
         select CLKSRC_MMIO
         select CPU_V6
         select GENERIC_CLOCKEVENTS
-        select GENERIC_GPIO
         select HAVE_CLK
         select HAVE_S3C2410_I2C if I2C
         select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@ -802,7 +827,6 @@ config ARCH_S5PC100
         select ARCH_USES_GETTIMEOFFSET
         select CLKDEV_LOOKUP
         select CPU_V7
-        select GENERIC_GPIO
         select HAVE_CLK
         select HAVE_S3C2410_I2C if I2C
         select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@ -820,7 +844,6 @@ config ARCH_S5PV210
         select CLKSRC_MMIO
         select CPU_V7
         select GENERIC_CLOCKEVENTS
-        select GENERIC_GPIO
         select HAVE_CLK
         select HAVE_S3C2410_I2C if I2C
         select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@ -838,7 +861,6 @@ config ARCH_EXYNOS
         select CLKDEV_LOOKUP
         select CPU_V7
         select GENERIC_CLOCKEVENTS
-        select GENERIC_GPIO
         select HAVE_CLK
         select HAVE_S3C2410_I2C if I2C
         select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@ -856,6 +878,7 @@ config ARCH_SHARK
         select ISA_DMA
         select NEED_MACH_MEMORY_H
         select PCI
+        select VIRT_TO_BUS
         select ZONE_DMA
         help
           Support for the StrongARM based Digital DNARD machine, also known
@@ -873,7 +896,6 @@ config ARCH_U300
         select COMMON_CLK
         select CPU_ARM926T
         select GENERIC_CLOCKEVENTS
-        select GENERIC_GPIO
         select HAVE_TCM
         select SPARSE_IRQ
         help
@@ -899,10 +921,12 @@ config ARCH_NOMADIK
         select ARCH_REQUIRE_GPIOLIB
         select ARM_AMBA
         select ARM_VIC
+        select CLKSRC_NOMADIK_MTU
         select COMMON_CLK
         select CPU_ARM926T
         select GENERIC_CLOCKEVENTS
         select MIGHT_HAVE_CACHE_L2X0
+        select USE_OF
         select PINCTRL
         select PINCTRL_STN8815
         select SPARSE_IRQ
@@ -937,33 +961,24 @@ config ARCH_DAVINCI
         help
           Support for TI's DaVinci platform.
 
-config ARCH_OMAP
-        bool "TI OMAP"
+config ARCH_OMAP1
+        bool "TI OMAP1"
         depends on MMU
         select ARCH_HAS_CPUFREQ
         select ARCH_HAS_HOLES_MEMORYMODEL
-        select ARCH_REQUIRE_GPIOLIB
-        select CLKSRC_MMIO
-        select GENERIC_CLOCKEVENTS
-        select HAVE_CLK
-        help
-          Support for TI's OMAP platform (OMAP1/2/3/4).
-
-config ARCH_VT8500_SINGLE
-        bool "VIA/WonderMedia 85xx"
-        select ARCH_HAS_CPUFREQ
+        select ARCH_OMAP
         select ARCH_REQUIRE_GPIOLIB
         select CLKDEV_LOOKUP
-        select COMMON_CLK
-        select CPU_ARM926T
+        select CLKSRC_MMIO
         select GENERIC_CLOCKEVENTS
-        select GENERIC_GPIO
+        select GENERIC_IRQ_CHIP
         select HAVE_CLK
-        select MULTI_IRQ_HANDLER
-        select SPARSE_IRQ
-        select USE_OF
+        select HAVE_IDE
+        select IRQ_DOMAIN
+        select NEED_MACH_IO_H if PCCARD
+        select NEED_MACH_MEMORY_H
         help
-          Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip.
+          Support for older TI OMAP1 (omap7xx, omap15xx or omap16xx)
 
 endchoice
 
@@ -991,12 +1006,12 @@ config ARCH_MULTI_V4_V5
         bool
 
 config ARCH_MULTI_V6
-        bool "ARMv6 based platforms (ARM11, Scorpion, ...)"
+        bool "ARMv6 based platforms (ARM11)"
         select ARCH_MULTI_V6_V7
         select CPU_V6
 
 config ARCH_MULTI_V7
-        bool "ARMv7 based platforms (Cortex-A, PJ4, Krait)"
+        bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)"
         default y
         select ARCH_MULTI_V6_V7
         select ARCH_VEXPRESS
@@ -1086,17 +1101,12 @@ source "arch/arm/mach-realview/Kconfig"
 source "arch/arm/mach-sa1100/Kconfig"
 
 source "arch/arm/plat-samsung/Kconfig"
-source "arch/arm/plat-s3c24xx/Kconfig"
 
 source "arch/arm/mach-socfpga/Kconfig"
 
 source "arch/arm/plat-spear/Kconfig"
 
 source "arch/arm/mach-s3c24xx/Kconfig"
-if ARCH_S3C24XX
-source "arch/arm/mach-s3c2412/Kconfig"
-source "arch/arm/mach-s3c2440/Kconfig"
-endif
 
 if ARCH_S3C64XX
 source "arch/arm/mach-s3c64xx/Kconfig"
@@ -1127,6 +1137,8 @@ source "arch/arm/mach-versatile/Kconfig"
 source "arch/arm/mach-vexpress/Kconfig"
 source "arch/arm/plat-versatile/Kconfig"
 
+source "arch/arm/mach-virt/Kconfig"
+
 source "arch/arm/mach-vt8500/Kconfig"
 
 source "arch/arm/mach-w90x900/Kconfig"
@@ -1531,7 +1543,6 @@ config SMP
 
 config SMP_ON_UP
         bool "Allow booting SMP kernel on uniprocessor systems (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
         depends on SMP && !XIP_KERNEL
         default y
         help
@@ -1572,9 +1583,10 @@ config HAVE_ARM_SCU
         help
           This option enables support for the ARM system coherency unit
 
-config ARM_ARCH_TIMER
+config HAVE_ARM_ARCH_TIMER
         bool "Architected timer support"
         depends on CPU_V7
+        select ARM_ARCH_TIMER
         help
           This option enables support for the ARM architected timer
 
@@ -1620,6 +1632,16 @@ config HOTPLUG_CPU
           Say Y here to experiment with turning CPUs off and on.  CPUs
           can be controlled through /sys/devices/system/cpu.
 
+config ARM_PSCI
+        bool "Support for the ARM Power State Coordination Interface (PSCI)"
+        depends on CPU_V7
+        help
+          Say Y here if you want Linux to communicate with system firmware
+          implementing the PSCI specification for CPU-centric power
+          management operations described in ARM document number ARM DEN
+          0022A ("Power State Coordination Interface System Software on
+          ARM processors").
+
 config LOCAL_TIMERS
         bool "Use local timer interrupts"
         depends on SMP
@@ -1631,13 +1653,16 @@ config LOCAL_TIMERS
           accounting to be spread across the timer interval, preventing a
           "thundering herd" at every timer tick.
 
+# The GPIO number here must be sorted by descending number. In case of
+# a multiplatform kernel, we just want the highest value required by the
+# selected platforms.
 config ARCH_NR_GPIO
         int
         default 1024 if ARCH_SHMOBILE || ARCH_TEGRA
+        default 512 if SOC_OMAP5
         default 355 if ARCH_U8500
+        default 288 if ARCH_VT8500 || ARCH_SUNXI
         default 264 if MACH_H4700
-        default 512 if SOC_OMAP5
-        default 288 if ARCH_VT8500
         default 0
         help
           Maximum number of GPIOs in the system.
@@ -1650,11 +1675,13 @@ config HZ
         int
         default 200 if ARCH_EBSA110 || ARCH_S3C24XX || ARCH_S5P64X0 || \
                 ARCH_S5PV210 || ARCH_EXYNOS4
-        default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER
         default AT91_TIMER_HZ if ARCH_AT91
         default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE
         default 100
 
+config SCHED_HRTICK
+        def_bool HIGH_RES_TIMERS
+
 config THUMB2_KERNEL
         bool "Compile the kernel in Thumb-2 mode"
         depends on CPU_V7 && !CPU_V6 && !CPU_V6K
@@ -1719,7 +1746,7 @@ config AEABI
 
 config OABI_COMPAT
         bool "Allow old ABI binaries to run with this kernel (EXPERIMENTAL)"
-        depends on AEABI && EXPERIMENTAL && !THUMB2_KERNEL
+        depends on AEABI && !THUMB2_KERNEL
         default y
         help
           This option preserves the old syscall interface along with the
@@ -1843,7 +1870,6 @@ config SECCOMP
 
 config CC_STACKPROTECTOR
         bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
         help
           This option turns on the -fstack-protector GCC feature. This
           feature puts, at the beginning of functions, a canary value on
@@ -1860,8 +1886,9 @@ config XEN_DOM0
 
 config XEN
         bool "Xen guest support on ARM (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && ARM && OF
+        depends on ARM && AEABI && OF
         depends on CPU_V7 && !CPU_V6
+        depends on !GENERIC_ATOMIC64
         help
           Say Y if you want to run Linux in a Virtual Machine on Xen on ARM.
 
@@ -1929,7 +1956,7 @@ config ZBOOT_ROM
 
 choice
         prompt "Include SD/MMC loader in zImage (EXPERIMENTAL)"
-        depends on ZBOOT_ROM && ARCH_SH7372 && EXPERIMENTAL
+        depends on ZBOOT_ROM && ARCH_SH7372
         default ZBOOT_ROM_NONE
         help
           Include experimental SD/MMC loading code in the ROM-able zImage.
@@ -1958,7 +1985,7 @@ endchoice
 
 config ARM_APPENDED_DTB
         bool "Use appended device tree blob to zImage (EXPERIMENTAL)"
-        depends on OF && !ZBOOT_ROM && EXPERIMENTAL
+        depends on OF && !ZBOOT_ROM
         help
           With this option, the boot code will look for a device tree binary
           (DTB) appended to zImage
@@ -2076,7 +2103,7 @@ config XIP_PHYS_ADDR
 
 config KEXEC
         bool "Kexec system call (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && (!SMP || HOTPLUG_CPU)
+        depends on (!SMP || HOTPLUG_CPU)
         help
           kexec is a system call that implements the ability to shutdown your
           current kernel, and to start another kernel.  It is like a reboot
@@ -2098,7 +2125,6 @@ config ATAGS_PROC
 
 config CRASH_DUMP
         bool "Build kdump crash kernel (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
         help
           Generate crash dump after being started by kexec. This should
           be normally only set in special crash dump kernels which are
@@ -2165,7 +2191,7 @@ config CPU_FREQ_S3C
 
 config CPU_FREQ_S3C24XX
         bool "CPUfreq driver for Samsung S3C24XX series CPUs (EXPERIMENTAL)"
-        depends on ARCH_S3C24XX && CPU_FREQ && EXPERIMENTAL
+        depends on ARCH_S3C24XX && CPU_FREQ
         select CPU_FREQ_S3C
         help
           This enables the CPUfreq driver for the Samsung S3C24XX family
@@ -2177,7 +2203,7 @@ config CPU_FREQ_S3C24XX
 
 config CPU_FREQ_S3C24XX_PLL
         bool "Support CPUfreq changing of PLL frequency (EXPERIMENTAL)"
-        depends on CPU_FREQ_S3C24XX && EXPERIMENTAL
+        depends on CPU_FREQ_S3C24XX
         help
           Compile in support for changing the PLL frequency from the
           S3C24XX series CPUfreq driver. The PLL takes time to settle
@@ -2240,7 +2266,7 @@ config FPE_NWFPE_XP
 
 config FPE_FASTFPE
         bool "FastFPE math emulation (EXPERIMENTAL)"
-        depends on (!AEABI || OABI_COMPAT) && !CPU_32v3 && EXPERIMENTAL
+        depends on (!AEABI || OABI_COMPAT) && !CPU_32v3
         ---help---
           Say Y here to include the FAST floating point emulator in the kernel.
           This is an experimental much faster emulator which now also has full
@@ -2322,3 +2348,5 @@ source "security/Kconfig"
 source "crypto/Kconfig"
 
 source "lib/Kconfig"
+
+source "arch/arm/kvm/Kconfig"