Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

Pull ARM SoC cleanups from Olof Johansson:
 "This branch contains code cleanups, moves and removals for 3.12.

  There's a large number of various cleanups, and a nice net removal of
  13500 lines of code.

  Highlights worth mentioning are:

   - A series of patches from Stephen Boyd removing the ARM local timer
     API.
   - Move of Qualcomm MSM IOMMU code to drivers/iommu.
   - Samsung PWM driver cleanups from Tomasz Figa, removing legacy PWM
     driver and switching over to the drivers/pwm one.
   - Removal of some unusued auto-generated headers for OMAP2+ (PRM/CM).

  There's also a move of a header file out of include/linux/i2c/ to
  platform_data, where it really belongs.  It touches mostly ARM
  platform code for include changes so we took it through our tree"

* tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (83 commits)
  ARM: OMAP2+: Add back the define for AM33XX_RST_GLOBAL_WARM_SW_MASK
  gpio: (gpio-pca953x) move header to linux/platform_data/
  arm: zynq: hotplug: Remove unreachable code
  ARM: SAMSUNG: Remove unnecessary exynos4_default_sdhci*()
  tegra: simplify use of devm_ioremap_resource
  ARM: SAMSUNG: Remove plat/regs-timer.h header
  ARM: SAMSUNG: Remove remaining uses of plat/regs-timer.h header
  ARM: SAMSUNG: Remove pwm-clock infrastructure
  ARM: SAMSUNG: Remove old PWM timer platform devices
  pwm: Remove superseded pwm-samsung-legacy driver
  ARM: SAMSUNG: Modify board files to use new PWM platform device
  ARM: SAMSUNG: Rework private data handling in dev-backlight
  pwm: Add new pwm-samsung driver
  ARM: mach-mvebu: remove redundant DT parsing and validation
  ARM: msm: Only compile io.c on platforms that use it
  iommu/msm: Move mach includes to iommu directory
  ARM: msm: Remove devices-iommu.c
  ARM: msm: Move mach/board.h contents to common.h
  ARM: msm: Migrate msm_timer to CLOCKSOURCE_OF_DECLARE
  ARM: msm: Remove TMR and TMR0 static mappings
  ...

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Kconfig.debug
index 4137529850cb7e1added45b46c61a29149840ead,15337833d05d4580005edb879d0dde262b7c4f1b..9762c84b419845f05ee6a7d1f9f95084dde310b5
--- 1/arch/arm/Kconfig.debug
--- 2/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -895,170 -775,43 +895,175 @@@ config DEBUG_LL_INCLUD
                                 DEBUG_IMX53_UART ||\
                                 DEBUG_IMX6Q_UART || \
                                 DEBUG_IMX6SL_UART
 -      default "debug/keystone.S" if DEBUG_KEYSTONE_UART0 || \
 -                                    DEBUG_KEYSTONE_UART1
+       default "debug/msm.S" if DEBUG_MSM_UART1 || \
+                                DEBUG_MSM_UART2 || \
+                                DEBUG_MSM_UART3 || \
+                                DEBUG_MSM8660_UART || \
+                                DEBUG_MSM8960_UART
 -      default "debug/mvebu.S" if DEBUG_MVEBU_UART || \
 -                                 DEBUG_MVEBU_UART_ALTERNATE
 -      default "debug/mxs.S" if DEBUG_IMX23_UART || DEBUG_IMX28_UART
 -      default "debug/nomadik.S" if DEBUG_NOMADIK_UART
 -      default "debug/nspire.S" if     DEBUG_NSPIRE_CX_UART || \
 -                                      DEBUG_NSPIRE_CLASSIC_UART
        default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART
 -      default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART
 -      default "debug/pxa.S" if DEBUG_PXA_UART1 || DEBUG_MMP_UART2 || \
 -                               DEBUG_MMP_UART3
 -      default "debug/rockchip.S" if DEBUG_ROCKCHIP_UART
        default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1
 -      default "debug/socfpga.S" if DEBUG_SOCFPGA_UART
        default "debug/sti.S" if DEBUG_STI_UART
 -      default "debug/sunxi.S" if DEBUG_SUNXI_UART0 || DEBUG_SUNXI_UART1
        default "debug/tegra.S" if DEBUG_TEGRA_UART
 -      default "debug/u300.S" if DEBUG_U300_UART
        default "debug/ux500.S" if DEBUG_UX500_UART
 -      default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \
 -              DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1 || \
 -              DEBUG_VEXPRESS_UART0_CRX
 +      default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT
        default "debug/vt8500.S" if DEBUG_VT8500_UART0
        default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1
        default "mach/debug-macro.S"
  
 +# Compatibility options for PL01x
 +config DEBUG_UART_PL01X
 +      def_bool ARCH_EP93XX || \
 +              ARCH_INTEGRATOR || \
 +              ARCH_SPEAR3XX || \
 +              ARCH_SPEAR6XX || \
 +              ARCH_SPEAR13XX || \
 +              ARCH_VERSATILE
 +
 +# Compatibility options for 8250
 +config DEBUG_UART_8250
 +      def_bool ARCH_DOVE || ARCH_EBSA110 || \
 +              (FOOTBRIDGE && !DEBUG_DC21285_PORT) || \
 +              ARCH_GEMINI || ARCH_IOP13XX || ARCH_IOP32X || \
 +              ARCH_IOP33X || ARCH_IXP4XX || ARCH_KIRKWOOD || \
 +              ARCH_LPC32XX || ARCH_MV78XX0 || ARCH_ORION5X || ARCH_RPC
 +
 +config DEBUG_UART_PHYS
 +      hex "Physical base address of debug UART"
 +      default 0x01c20000 if DEBUG_DAVINCI_DMx_UART0
 +      default 0x01c28000 if DEBUG_SUNXI_UART0
 +      default 0x01c28400 if DEBUG_SUNXI_UART1
 +      default 0x01d0c000 if DEBUG_DAVINCI_DA8XX_UART1
 +      default 0x01d0d000 if DEBUG_DAVINCI_DA8XX_UART2
 +      default 0x02530c00 if DEBUG_KEYSTONE_UART0
 +      default 0x02531000 if DEBUG_KEYSTONE_UART1
 +      default 0x03010fe0 if ARCH_RPC
 +      default 0x08108300 if DEBUG_DAVINCI_TNETV107X_UART1
 +      default 0x10009000 if DEBUG_REALVIEW_STD_PORT || DEBUG_CNS3XXX || \
 +                              DEBUG_VEXPRESS_UART0_CA9
 +      default 0x1010c000 if DEBUG_REALVIEW_PB1176_PORT
 +      default 0x10124000 if DEBUG_RK3X_UART0
 +      default 0x10126000 if DEBUG_RK3X_UART1
 +      default 0x101f1000 if ARCH_VERSATILE
 +      default 0x101fb000 if DEBUG_NOMADIK_UART
 +      default 0x16000000 if ARCH_INTEGRATOR
 +      default 0x1c090000 if DEBUG_VEXPRESS_UART0_RS1
 +      default 0x20060000 if DEBUG_RK29_UART0
 +      default 0x20064000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2
 +      default 0x20068000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3
 +      default 0x20201000 if DEBUG_BCM2835
 +      default 0x40090000 if ARCH_LPC32XX
 +      default 0x40100000 if DEBUG_PXA_UART1
 +      default 0x42000000 if ARCH_GEMINI
 +      default 0x7c0003f8 if FOOTBRIDGE
 +      default 0x80230000 if DEBUG_PICOXCELL_UART
 +      default 0x80070000 if DEBUG_IMX23_UART
 +      default 0x80074000 if DEBUG_IMX28_UART
 +      default 0x808c0000 if ARCH_EP93XX
 +      default 0x90020000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART
 +      default 0xb0090000 if DEBUG_VEXPRESS_UART0_CRX
 +      default 0xc0013000 if DEBUG_U300_UART
 +      default 0xc8000000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN
 +      default 0xc8000003 if ARCH_IXP4XX && CPU_BIG_ENDIAN
 +      default 0xd0000000 if ARCH_SPEAR3XX || ARCH_SPEAR6XX
 +      default 0xd0012000 if DEBUG_MVEBU_UART
 +      default 0xd4017000 if DEBUG_MMP_UART2
 +      default 0xd4018000 if DEBUG_MMP_UART3
 +      default 0xe0000000 if ARCH_SPEAR13XX
 +      default 0xf0000be0 if ARCH_EBSA110
 +      default 0xf1012000 if DEBUG_MVEBU_UART_ALTERNATE
 +      default 0xf1012000 if ARCH_DOVE || ARCH_KIRKWOOD || ARCH_MV78XX0 || \
 +                              ARCH_ORION5X
 +      default 0xf8b00000 if DEBUG_HI3716_UART
 +      default 0xfcb00000 if DEBUG_HI3620_UART
 +      default 0xfe800000 if ARCH_IOP32X
 +      default 0xffc02000 if DEBUG_SOCFPGA_UART
 +      default 0xffd82340 if ARCH_IOP13XX
 +      default 0xfff36000 if DEBUG_HIGHBANK_UART
 +      default 0xfffff700 if ARCH_IOP33X
 +      depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
 +              DEBUG_UART_8250 || DEBUG_UART_PL01X
 +
 +config DEBUG_UART_VIRT
 +      hex "Virtual base address of debug UART"
 +      default 0xe0010fe0 if ARCH_RPC
 +      default 0xf0000be0 if ARCH_EBSA110
 +      default 0xf0009000 if DEBUG_CNS3XXX
 +      default 0xf01fb000 if DEBUG_NOMADIK_UART
 +      default 0xf0201000 if DEBUG_BCM2835
 +      default 0xf11f1000 if ARCH_VERSATILE
 +      default 0xf1600000 if ARCH_INTEGRATOR
 +      default 0xf1c28000 if DEBUG_SUNXI_UART0
 +      default 0xf1c28400 if DEBUG_SUNXI_UART1
 +      default 0xf2100000 if DEBUG_PXA_UART1
 +      default 0xf4090000 if ARCH_LPC32XX
 +      default 0xf4200000 if ARCH_GEMINI
 +      default 0xf8009000 if DEBUG_VEXPRESS_UART0_CA9
 +      default 0xf8090000 if DEBUG_VEXPRESS_UART0_RS1
 +      default 0xfb009000 if DEBUG_REALVIEW_STD_PORT
 +      default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT
 +      default 0xfd000000 if ARCH_SPEAR3XX || ARCH_SPEAR6XX
 +      default 0xfd000000 if ARCH_SPEAR13XX
 +      default 0xfd012000 if ARCH_MV78XX0
 +      default 0xfde12000 if ARCH_DOVE
 +      default 0xfe012000 if ARCH_ORION5X
 +      default 0xfe017000 if DEBUG_MMP_UART2
 +      default 0xfe018000 if DEBUG_MMP_UART3
 +      default 0xfe100000 if DEBUG_IMX23_UART || DEBUG_IMX28_UART
 +      default 0xfe230000 if DEBUG_PICOXCELL_UART
 +      default 0xfe800000 if ARCH_IOP32X
 +      default 0xfeb00000 if DEBUG_HI3620_UART || DEBUG_HI3716_UART
 +      default 0xfeb24000 if DEBUG_RK3X_UART0
 +      default 0xfeb26000 if DEBUG_RK3X_UART1
 +      default 0xfeb30c00 if DEBUG_KEYSTONE_UART0
 +      default 0xfeb31000 if DEBUG_KEYSTONE_UART1
 +      default 0xfec12000 if DEBUG_MVEBU_UART || DEBUG_MVEBU_UART_ALTERNATE
 +      default 0xfed60000 if DEBUG_RK29_UART0
 +      default 0xfed64000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2
 +      default 0xfed68000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3
 +      default 0xfec02000 if DEBUG_SOCFPGA_UART
 +      default 0xfec20000 if DEBUG_DAVINCI_DMx_UART0
 +      default 0xfed0c000 if DEBUG_DAVINCI_DA8XX_UART1
 +      default 0xfed0d000 if DEBUG_DAVINCI_DA8XX_UART2
 +      default 0xfed12000 if ARCH_KIRKWOOD
 +      default 0xfedc0000 if ARCH_EP93XX
 +      default 0xfee003f8 if FOOTBRIDGE
 +      default 0xfee08300 if DEBUG_DAVINCI_TNETV107X_UART1
 +      default 0xfee20000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART
 +      default 0xfef36000 if DEBUG_HIGHBANK_UART
 +      default 0xfee82340 if ARCH_IOP13XX
 +      default 0xfef00000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN
 +      default 0xfef00003 if ARCH_IXP4XX && CPU_BIG_ENDIAN
 +      default 0xfefff700 if ARCH_IOP33X
 +      default 0xff003000 if DEBUG_U300_UART
 +      default DEBUG_UART_PHYS if !MMU
 +      depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
 +              DEBUG_UART_8250 || DEBUG_UART_PL01X
 +
 +config DEBUG_UART_8250_SHIFT
 +      int "Register offset shift for the 8250 debug UART"
 +      depends on DEBUG_LL_UART_8250 || DEBUG_UART_8250
 +      default 0 if FOOTBRIDGE || ARCH_IOP32X
 +      default 2
 +
 +config DEBUG_UART_8250_WORD
 +      bool "Use 32-bit accesses for 8250 UART"
 +      depends on DEBUG_LL_UART_8250 || DEBUG_UART_8250
 +      depends on DEBUG_UART_8250_SHIFT >= 2
 +      default y if DEBUG_PICOXCELL_UART || DEBUG_SOCFPGA_UART || \
 +              ARCH_KEYSTONE || \
 +              DEBUG_DAVINCI_DMx_UART0 || DEBUG_DAVINCI_DA8XX_UART1 || \
 +              DEBUG_DAVINCI_DA8XX_UART2 || DEBUG_DAVINCI_TNETV107X_UART1
 +
 +config DEBUG_UART_8250_FLOW_CONTROL
 +      bool "Enable flow control for 8250 UART"
 +      depends on DEBUG_LL_UART_8250 || DEBUG_UART_8250
 +      default y if ARCH_EBSA110 || FOOTBRIDGE || ARCH_GEMINI || ARCH_RPC
 +
  config DEBUG_UNCOMPRESS
        bool
-       depends on ARCH_MULTIPLATFORM
+       depends on ARCH_MULTIPLATFORM || ARCH_MSM
        default y if DEBUG_LL && !DEBUG_OMAP2PLUS_UART && \
 -                   !DEBUG_TEGRA_UART
 +                   (!DEBUG_TEGRA_UART || !ZBOOT_ROM)
        help
          This option influences the normal decompressor output for
          multiplatform kernels.  Normally, multiplatform kernels disable

diff --cc arch/arm/boot/dts/exynos5250.dtsi
Simple merge

diff --cc arch/arm/boot/dts/exynos5440.dtsi
Simple merge

diff --cc arch/arm/kernel/smp.c
index 92d10e503746b91b095276de4d234f85d3b9b7fd,3a98192a311814a7bd9f460dafe5f0927600f6fe..72024ea8a3a6c07038103e153527cb2454e4552f
--- 1/arch/arm/kernel/smp.c
--- 2/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@@ -145,19 -144,7 +144,17 @@@ int boot_secondary(unsigned int cpu, st
        return -ENOSYS;
  }
  
 +int platform_can_cpu_hotplug(void)
 +{
 +#ifdef CONFIG_HOTPLUG_CPU
 +      if (smp_ops.cpu_kill)
 +              return 1;
 +#endif
 +
 +      return 0;
 +}
 +
  #ifdef CONFIG_HOTPLUG_CPU
- static void percpu_timer_stop(void);
- 
  static int platform_cpu_kill(unsigned int cpu)
  {
        if (smp_ops.cpu_kill)

diff --cc arch/arm/mach-davinci/board-da850-evm.c
Simple merge

diff --cc arch/arm/mach-msm/devices-msm7x30.c
Simple merge

diff --cc arch/arm/mach-msm/devices-qsd8x50.c
Simple merge

diff --cc arch/arm/mach-mvebu/platsmp.c
Simple merge

diff --cc arch/arm/mach-omap2/Kconfig
Simple merge

diff --cc arch/arm/mach-omap2/board-am3517evm.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_54xx_data.c
Simple merge

diff --cc arch/arm/mach-omap2/timer.c
Simple merge

diff --cc arch/arm/mach-pxa/zeus.c
index 04a0aea238730b0ec4bb5426f66c3e0266ac6de6,126e4a806a077b7fbb72b44dec67785f90aaa31b..b19d1c361cab51c2689a9f494c83bf2e79a7f813
--- 1/arch/arm/mach-pxa/zeus.c
--- 2/arch/arm/mach-pxa/zeus.c
+++ b/arch/arm/mach-pxa/zeus.c
@@@ -26,11 -26,9 +26,11 @@@
  #include <linux/mtd/physmap.h>
  #include <linux/i2c.h>
  #include <linux/i2c/pxa-i2c.h>
- #include <linux/i2c/pca953x.h>
+ #include <linux/platform_data/pca953x.h>
  #include <linux/apm-emulation.h>
  #include <linux/can/platform/mcp251x.h>
 +#include <linux/regulator/fixed.h>
 +#include <linux/regulator/machine.h>
  
  #include <asm/mach-types.h>
  #include <asm/suspend.h>

diff --cc arch/arm/mach-shmobile/board-armadillo800eva.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-lager.c
Simple merge

diff --cc arch/arm/mach-shmobile/include/mach/r8a7778.h
Simple merge

diff --cc arch/arm/mach-shmobile/setup-r8a7778.c
Simple merge

diff --cc arch/arm/mach-shmobile/setup-r8a7779.c
Simple merge