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
  ...

1 files changed, 3 insertions, 4 deletions

diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index 4f1709b31822..5f63f513d9c9 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -17,7 +17,7 @@ config ARCH_BCM_IPROC
         select ARM_GLOBAL_TIMER
         select COMMON_CLK_IPROC
         select CLKSRC_MMIO
-        select ARCH_REQUIRE_GPIOLIB
+        select GPIOLIB
         select ARM_AMBA
         select PINCTRL
         help
@@ -80,7 +80,7 @@ comment "KONA architected SoCs"
 
 config ARCH_BCM_MOBILE
         bool
-        select ARCH_REQUIRE_GPIOLIB
+        select GPIOLIB
         select ARM_ERRATA_754322
         select ARM_ERRATA_775420
         select ARM_GIC
@@ -138,7 +138,7 @@ comment "Other Architectures"
 config ARCH_BCM2835
         bool "Broadcom BCM2835 family"
         depends on ARCH_MULTI_V6 || ARCH_MULTI_V7
-        select ARCH_REQUIRE_GPIOLIB
+        select GPIOLIB
         select ARM_AMBA
         select ARM_ERRATA_411920 if ARCH_MULTI_V6
         select ARM_TIMER_SP804
@@ -178,7 +178,6 @@ config ARCH_BRCMSTB
         select BRCMSTB_L2_IRQ
         select BCM7120_L2_IRQ
         select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
-        select ARCH_WANT_OPTIONAL_GPIOLIB
         select SOC_BRCMSTB
         select SOC_BUS
         help