Merge branch 'next/spring-cleaning' into next/cleanup

diff --combined arch/arm/Kconfig
index 5c76238,b237128..f0a579e
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -49,6 -49,7 +49,6 @@@ config AR
        select HAVE_REGS_AND_STACK_ACCESS_API
        select HAVE_SYSCALL_TRACEPOINTS
        select HAVE_UID16
 -      select HAVE_VIRT_TO_BUS
        select KTIME_SCALAR
        select PERF_USE_VMALLOC
        select RTC_LIB
@@@ -410,6 -411,7 +410,7 @@@ config ARCH_GEMIN
        bool "Cortina Systems Gemini"
        select ARCH_REQUIRE_GPIOLIB
        select ARCH_USES_GETTIMEOFFSET
+       select NEED_MACH_GPIO_H
        select CPU_FA526
        help
          Support for the Cortina Systems Gemini family SoCs
@@@ -473,14 -475,12 +474,14 @@@ config ARCH_MX
        select ARCH_REQUIRE_GPIOLIB
        select CLKDEV_LOOKUP
        select CLKSRC_MMIO
 +      select CLKSRC_OF
        select COMMON_CLK
        select GENERIC_CLOCKEVENTS
        select HAVE_CLK_PREPARE
        select MULTI_IRQ_HANDLER
        select PINCTRL
        select SPARSE_IRQ
 +      select STMP_DEVICE
        select USE_OF
        help
          Support for Freescale MXS-based family of processors
@@@ -494,14 -494,6 +495,6 @@@ config ARCH_NET
        help
          This enables support for systems based on the Hilscher NetX Soc
  
- config ARCH_H720X
-       bool "Hynix HMS720x-based"
-       select ARCH_USES_GETTIMEOFFSET
-       select CPU_ARM720T
-       select ISA_DMA_API
-       help
-         This enables support for systems based on the Hynix HMS720x
- 
  config ARCH_IOP13XX
        bool "IOP13xx-based"
        depends on MMU
@@@ -557,6 -549,7 +550,6 @@@ config ARCH_IXP4X
  config ARCH_DOVE
        bool "Marvell Dove"
        select ARCH_REQUIRE_GPIOLIB
 -      select COMMON_CLK_DOVE
        select CPU_V7
        select GENERIC_CLOCKEVENTS
        select MIGHT_HAVE_PCI
@@@ -744,7 -737,6 +737,7 @@@ config ARCH_RP
        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.
@@@ -880,7 -872,6 +873,7 @@@ config ARCH_SHAR
        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
@@@ -1008,12 -999,12 +1001,12 @@@ config ARCH_MULTI_V4_V
        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
@@@ -1053,8 -1044,6 +1046,6 @@@ source "arch/arm/mach-footbridge/Kconfi
  
  source "arch/arm/mach-gemini/Kconfig"
  
- source "arch/arm/mach-h720x/Kconfig"
- 
  source "arch/arm/mach-highbank/Kconfig"
  
  source "arch/arm/mach-integrator/Kconfig"
@@@ -1175,6 -1164,7 +1166,6 @@@ config PLAT_VERSATIL
  config ARM_TIMER_SP804
        bool
        select CLKSRC_MMIO
 -      select HAVE_SCHED_CLOCK
  
  source arch/arm/mm/Kconfig
  
@@@ -1463,6 -1453,10 +1454,6 @@@ config ISA_DM
        bool
        select ISA_DMA_API
  
 -config ARCH_NO_VIRT_TO_BUS
 -      def_bool y
 -      depends on !ARCH_RPC && !ARCH_NETWINDER && !ARCH_SHARK
 -
  # Select ISA DMA interface
  config ISA_DMA_API
        bool
@@@ -1594,7 -1588,6 +1585,7 @@@ config HAVE_ARM_ARCH_TIME
  config HAVE_ARM_TWD
        bool
        depends on SMP
 +      select CLKSRC_OF if OF
        help
          This options enables support for the ARM timer and watchdog unit
  
@@@ -1655,16 -1648,13 +1646,16 @@@ config LOCAL_TIMER
          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 355 if ARCH_U8500
 -      default 264 if MACH_H4700
        default 512 if SOC_OMAP5
 +      default 355 if ARCH_U8500
        default 288 if ARCH_VT8500 || ARCH_SUNXI
 +      default 264 if MACH_H4700
        default 0
        help
          Maximum number of GPIOs in the system.
@@@ -1888,9 -1878,8 +1879,9 @@@ config XEN_DOM
  
  config XEN
        bool "Xen guest support on ARM (EXPERIMENTAL)"
 -      depends on 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.
  
@@@ -2155,6 -2144,13 +2146,6 @@@ if ARCH_HAS_CPUFRE
  
  source "drivers/cpufreq/Kconfig"
  
 -config CPU_FREQ_IMX
 -      tristate "CPUfreq driver for i.MX CPUs"
 -      depends on ARCH_MXC && CPU_FREQ
 -      select CPU_FREQ_TABLE
 -      help
 -        This enables the CPUfreq driver for i.MX CPUs.
 -
  config CPU_FREQ_SA1100
        bool