Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman...

diff --combined arch/arm/Kconfig
index c52f6909f65d7aa316d5efe8828480684f0acd63,915b39382e65979f71bfbafd209602da9f7480d3..65bf774a26fd7c60c3f82c293d22ca60660e4c0d
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -253,14 -253,6 +253,14 @@@ config ARCH_CLPS711
        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
@@@ -281,9 -273,18 +281,10 @@@ config ARCH_EP93X
        select HAVE_CLK
        select COMMON_CLKDEV
        select ARCH_REQUIRE_GPIOLIB
+       select ARCH_HAS_HOLES_MEMORYMODEL
        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
@@@ -292,17 -293,6 +293,17 @@@
          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
@@@ -319,6 -309,15 +320,6 @@@ config ARCH_H720
        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
@@@ -406,6 -405,28 +407,6 @@@ config ARCH_KIRKWOO
          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
@@@ -427,6 -448,17 +428,6 @@@ config ARCH_MV78XX
          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
@@@ -441,49 -473,6 +442,49 @@@
          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
 +      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
@@@ -506,16 -495,19 +507,16 @@@ config ARCH_PX
        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"
@@@ -595,6 -587,7 +596,7 @@@ config ARCH_DAVINC
        select ZONE_DMA
        select HAVE_IDE
        select COMMON_CLKDEV
+       select GENERIC_ALLOCATOR
        help
          Support for TI's DaVinci platform.
  
@@@ -608,6 -601,24 +610,6 @@@ config ARCH_OMA
        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"
@@@ -673,6 -684,8 +675,6 @@@ endi
  
  source "arch/arm/mach-lh7a40x/Kconfig"
  
 -source "arch/arm/mach-imx/Kconfig"
 -
  source "arch/arm/mach-h720x/Kconfig"
  
  source "arch/arm/mach-versatile/Kconfig"
@@@ -965,10 -978,9 +967,9 @@@ config OABI_COMPA
          UNPREDICTABLE (in fact it can be predicted that it won't work
          at all). If in doubt say Y.
  
- config ARCH_FLATMEM_HAS_HOLES
+ config ARCH_HAS_HOLES_MEMORYMODEL
        bool
-       default y
-       depends on FLATMEM
+       default n
  
  # Discontigmem is deprecated
  config ARCH_DISCONTIGMEM_ENABLE
@@@ -1011,7 -1023,7 +1012,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 || \
@@@ -1177,7 -1189,7 +1178,7 @@@ endmen
  
  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"
  
@@@ -1202,11 -1214,14 +1203,11 @@@ config CPU_FREQ_INTEGRATO
  
          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
  

diff --combined arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
index 78ac1bddc8bc9c065a3abf0ab5f7b93324e94683,1732de7629a5dd245bdb6e96e0b3e8aac203ad4e..420f71b851232183bab46746a83b36da81b69019
--- 1/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
--- 2/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
+++ b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
@@@ -147,7 -147,6 +147,7 @@@
  #define EP93XX_PWM_BASE                       (EP93XX_APB_VIRT_BASE + 0x00110000)
  
  #define EP93XX_RTC_BASE                       (EP93XX_APB_VIRT_BASE + 0x00120000)
 +#define EP93XX_RTC_PHYS_BASE          (EP93XX_APB_PHYS_BASE + 0x00120000)
  
  #define EP93XX_SYSCON_BASE            (EP93XX_APB_VIRT_BASE + 0x00130000)
  #define EP93XX_SYSCON_REG(x)          (EP93XX_SYSCON_BASE + (x))
@@@ -160,7 -159,10 +160,10 @@@
  #define EP93XX_SYSCON_CLOCK_SET1      EP93XX_SYSCON_REG(0x20)
  #define EP93XX_SYSCON_CLOCK_SET2      EP93XX_SYSCON_REG(0x24)
  #define EP93XX_SYSCON_DEVICE_CONFIG   EP93XX_SYSCON_REG(0x80)
- #define EP93XX_SYSCON_DEVICE_CONFIG_CRUNCH_ENABLE     0x00800000
+ #define EP93XX_SYSCON_DEVICE_CONFIG_U3EN              (1<<24)
+ #define EP93XX_SYSCON_DEVICE_CONFIG_CRUNCH_ENABLE     (1<<23)
+ #define EP93XX_SYSCON_DEVICE_CONFIG_U2EN              (1<<20)
+ #define EP93XX_SYSCON_DEVICE_CONFIG_U1EN              (1<<18)
  #define EP93XX_SYSCON_SWLOCK          EP93XX_SYSCON_REG(0xc0)
  
  #define EP93XX_WATCHDOG_BASE          (EP93XX_APB_VIRT_BASE + 0x00140000)