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

Pull ARM SoC cleanups from Olof Johansson:
 "The cleanup branch keeps going down in size as we've completed a lot
  of the major legacy platform removals and conversions.

  A handful of changes this time around, some of the themes or larger
  sets are:

   - A bunch of i.MX cleanups around platform detection, init call cleanups
   - Misc fixes of missing/implicit includes
   - Removal of ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB"

* tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (40 commits)
  ARM: mps2: fix typo
  ARM: s3c64xx: avoid warning about 'struct device_node'
  bus: mvebu-mbus: make mvebu_mbus_syscore_ops static
  bus: mvebu-mbus: fix __iomem on register pointers
  ARM: tegra: Remove board_init_funcs array
  ARM: iop: Fix indentation
  ARM: imx: remove cpu_is_mx*()
  ARM: imx: remove last call to cpu_is_mx5*
  ARM: imx: rework mx27_pm_init() call
  ARM: imx: deconstruct mx3_idle
  ARM: imx: deconstruct mxc_rnga initialization
  ARM: imx: remove cpu_is_mx1 check
  ARM: i.MX: Do not explicitly call l2x0_of_init()
  ARM: i.MX: system.c: Tweak prefetch settings for performance
  ARM: i.MX: system.c: Replace magic numbers
  ARM: i.MX: system.c: Remove redundant errata 752271 code
  ARM: i.MX: system.c: Convert goto to if statement
  ARM: Kirkwood: fix kirkwood_pm_init() declaration/type
  ARM: Kirkwood: make kirkwood_disable_mbus_error_propagation() static
  ARM: orion5x: make orion5x_legacy_handle_irq static
  ...

diff --cc arch/arm/Kconfig
index 4c445fb9c189fe1d527c086f87a572f876830d73,1bf9a108e99b9e00ab84bb1fafde3ee11ad812bc..9ec5f5588dc5197eb291b7c65ef6357ae4e469bc
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -356,12 -354,12 +354,12 @@@ config ARM_SINGLE_ARMV7
  
  config ARCH_CLPS711X
        bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
-       select ARCH_REQUIRE_GPIOLIB
        select AUTO_ZRELADDR
 -      select CLKSRC_MMIO
        select COMMON_CLK
        select CPU_ARM720T
        select GENERIC_CLOCKEVENTS
 +      select CLPS711X_TIMER
+       select GPIOLIB
        select MFD_SYSCON
        select SOC_BUS
        help

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

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

diff --cc arch/arm/mach-imx/mach-imx51.c
Simple merge

diff --cc arch/arm/mach-imx/mach-imx53.c
Simple merge

diff --cc arch/arm/mach-imx/mach-imx6q.c
Simple merge

diff --cc arch/arm/mach-imx/mach-imx6sl.c
Simple merge

diff --cc arch/arm/mach-imx/mach-imx6sx.c
Simple merge

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

diff --cc arch/arm/mach-moxart/Kconfig
index ddc79cea32d3ee6798b9c0cd228a5995a8c268e4,6eca2363b81a679b90a03fdeeb5717f711c70b73..f69e28b85e884908ce040997271f9f7e9335cc14
--- 1/arch/arm/mach-moxart/Kconfig
--- 2/arch/arm/mach-moxart/Kconfig
+++ b/arch/arm/mach-moxart/Kconfig
@@@ -3,9 -3,9 +3,9 @@@ menuconfig ARCH_MOXAR
        depends on ARCH_MULTI_V4
        select CPU_FA526
        select ARM_DMA_MEM_BUFFERABLE
 -      select CLKSRC_MMIO
 +      select MOXART_TIMER
        select GENERIC_IRQ_CHIP
-       select ARCH_REQUIRE_GPIOLIB
+       select GPIOLIB
        select PHYLIB if NETDEVICES
        help
          Say Y here if you want to run your kernel on hardware with a

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

diff --cc arch/arm/mach-mxs/Kconfig
index 68a3a9ec605dbf083b0ff747cf64c4bc3a5e1f0f,5d9e5fce7937d664ad84a3421e6664bbb46dd845..cb429bc6dc0da49170a35a45d3ad6ae21157a53e
--- 1/arch/arm/mach-mxs/Kconfig
--- 2/arch/arm/mach-mxs/Kconfig
+++ b/arch/arm/mach-mxs/Kconfig
@@@ -15,8 -15,8 +15,8 @@@ config SOC_IMX2
  config ARCH_MXS
        bool "Freescale MXS (i.MX23, i.MX28) support"
        depends on ARCH_MULTI_V5
-       select ARCH_REQUIRE_GPIOLIB
 -      select CLKSRC_MMIO
+       select GPIOLIB
 +      select MXS_TIMER
        select PINCTRL
        select SOC_BUS
        select SOC_IMX23

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

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

diff --cc arch/arm/mach-tegra/tegra.c
index 6745a657d261c6a2cda6a55b35ff7953b0bc2c2e,42d7ee9658facac7fccaca9bae02ee737f6e2771..e01cbca196b544f57e95ffb1e21e831b93adec03
--- 1/arch/arm/mach-tegra/tegra.c
--- 2/arch/arm/mach-tegra/tegra.c
+++ b/arch/arm/mach-tegra/tegra.c
@@@ -115,26 -115,11 +115,11 @@@ static void __init tegra_dt_init(void
         * devices
         */
  out:
 -      of_platform_populate(NULL, of_default_bus_match_table, NULL, parent);
 +      of_platform_default_populate(NULL, NULL, parent);
  }
  
- static void __init paz00_init(void)
- {
-       if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC))
-               tegra_paz00_wifikill_init();
- }
- 
- static struct {
-       char *machine;
-       void (*init)(void);
- } board_init_funcs[] = {
-       { "compal,paz00", paz00_init },
- };
- 
  static void __init tegra_dt_init_late(void)
  {
-       int i;
- 
        tegra_init_suspend();
        tegra_cpuidle_init();
  

diff --cc arch/arm/mach-u300/Kconfig
index 4fdc3425ffbd2d12120d3a322b34063c1478e06e,56e0ef680b7911d6b4a5b3aa046a5188ae01748b..22dcbf5b76b2d49db66a38700a1be9b30dd32e57
--- 1/arch/arm/mach-u300/Kconfig
--- 2/arch/arm/mach-u300/Kconfig
+++ b/arch/arm/mach-u300/Kconfig
@@@ -1,11 -1,11 +1,11 @@@
  menuconfig ARCH_U300
        bool "ST-Ericsson U300 Series"
        depends on ARCH_MULTI_V5 && MMU
-       select ARCH_REQUIRE_GPIOLIB
        select ARM_AMBA
        select ARM_VIC
 -      select CLKSRC_MMIO
 +      select U300_TIMER
        select CPU_ARM926T
+       select GPIOLIB
        select HAVE_TCM
        select PINCTRL
        select PINCTRL_COH901

diff --cc arch/arm/mach-vexpress/spc.c
Simple merge