From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 1 Aug 2016 22:21:13 +0000 (-0400)
Subject: Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6f888fe31dfcda4cb25018b0af3f50049fcf0b7f;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'armsoc-cleanup' of git://git./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
  ...
---

6f888fe31dfcda4cb25018b0af3f50049fcf0b7f
diff --cc arch/arm/Kconfig
index 4c445fb9c189,1bf9a108e99b..9ec5f5588dc5
--- a/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-moxart/Kconfig
index ddc79cea32d3,6eca2363b81a..f69e28b85e88
--- a/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-mxs/Kconfig
index 68a3a9ec605d,5d9e5fce7937..cb429bc6dc0d
--- a/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-tegra/tegra.c
index 6745a657d261,42d7ee9658fa..e01cbca196b5
--- a/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 4fdc3425ffbd,56e0ef680b79..22dcbf5b76b2
--- a/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