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

Pull ARM SoC cleanups on various subarchitectures from Olof Johansson:
 "Cleanup patches for various ARM platforms and some of their associated
  drivers.  There's also a branch in here that enables Freescale i.MX to
  be part of the multiplatform support -- the first "big" SoC that is
  moved over (more multiplatform work comes in a separate branch later
  during the merge window)."

Conflicts fixed as per Olof, including a silent semantic one in
arch/arm/mach-omap2/board-generic.c (omap_prcm_restart() was renamed to
omap3xxx_restart(), and a new user of the old name was added).

* tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (189 commits)
  ARM: omap: fix typo on timer cleanup
  ARM: EXYNOS: Remove unused regs-mem.h file
  ARM: EXYNOS: Remove unused non-dt support for dwmci controller
  ARM: Kirkwood: Use hw_pci.ops instead of hw_pci.scan
  ARM: OMAP3: cm-t3517: use GPTIMER for system clock
  ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER
  ARM: SAMSUNG: use devm_ functions for ADC driver
  ARM: EXYNOS: no duplicate mask/unmask in eint0_15
  ARM: S3C24XX: SPI clock channel setup is fixed for S3C2443
  ARM: EXYNOS: Remove i2c0 resource information and setting of device names
  ARM: Kirkwood: checkpatch cleanups
  ARM: Kirkwood: Fix sparse warnings.
  ARM: Kirkwood: Remove unused includes
  ARM: kirkwood: cleanup lsxl board includes
  ARM: integrator: use BUG_ON where possible
  ARM: integrator: push down SC dependencies
  ARM: integrator: delete static UART1 mapping
  ARM: integrator: delete SC mapping on the CP
  ARM: integrator: remove static CP syscon mapping
  ARM: integrator: remove static AP syscon mapping
  ...

diff --cc Documentation/devicetree/bindings/i2c/i2c-imx.txt
Simple merge

diff --cc Documentation/devicetree/bindings/usb/am33xx-usb.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/boot/dts/tegra20-seaboard.dts
Simple merge

diff --cc arch/arm/mach-at91/at91sam9g45.c
Simple merge

diff --cc arch/arm/mach-kirkwood/pcie.c
Simple merge

diff --cc arch/arm/mach-omap2/board-generic.c
index 601ecdfb1cf9b88217caf49a3d8a9eedc34e6411,aa6e4a19dd90d3bc489b73db6e44ee91665256a5..f0715a369c44b80af01759e67c22cc2f274fba54
--- 1/arch/arm/mach-omap2/board-generic.c
--- 2/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@@ -95,7 -95,24 +95,24 @@@ DT_MACHINE_START(OMAP3_DT, "Generic OMA
        .init_machine   = omap_generic_init,
        .timer          = &omap3_timer,
        .dt_compat      = omap3_boards_compat,
-       .restart        = omap_prcm_restart,
+       .restart        = omap3xxx_restart,
+ MACHINE_END
+ 
+ static const char *omap3_gp_boards_compat[] __initdata = {
+       "ti,omap3-beagle",
+       NULL,
+ };
+ 
+ DT_MACHINE_START(OMAP3_GP_DT, "Generic OMAP3-GP (Flattened Device Tree)")
+       .reserve        = omap_reserve,
+       .map_io         = omap3_map_io,
+       .init_early     = omap3430_init_early,
+       .init_irq       = omap_intc_of_init,
+       .handle_irq     = omap3_intc_handle_irq,
+       .init_machine   = omap_generic_init,
+       .timer          = &omap3_secure_timer,
+       .dt_compat      = omap3_gp_boards_compat,
 -      .restart        = omap_prcm_restart,
++      .restart        = omap3xxx_restart,
  MACHINE_END
  #endif
  

diff --cc arch/arm/mach-omap2/common.h
Simple merge

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

diff --cc arch/arm/mach-u300/core.c
Simple merge

diff --cc drivers/clk/clk-bcm2835.c
Simple merge

diff --cc drivers/gpio/gpio-pxa.c
Simple merge

diff --cc drivers/media/platform/soc_camera/mx2_camera.c
Simple merge

diff --cc drivers/media/platform/soc_camera/mx3_camera.c
Simple merge

diff --cc drivers/mmc/host/mxcmmc.c
Simple merge

diff --cc drivers/staging/nvec/nvec.c
Simple merge

diff --cc drivers/usb/host/ehci-mxc.c
Simple merge

diff --cc drivers/watchdog/omap_wdt.c
Simple merge