From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Nov 2015 22:48:36 +0000 (-0800)
Subject: Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a5e1d715a8d0696961d99d31d869aa522f1cad5a;p=openwrt%2Fstaging%2Fblogic.git

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

Pull ARM SoC cleanups from Olof Johansson:
 "Again we have a sizable (but not huge) cleanup branch with a net delta
  of about -3k lines.

  Main contents here is:

   - A bunch of development/cleanup of a few PXA boards
   - Removal of bockw platforms on shmobile, since the platform has now
     gone completely multiplatform.  Whee!
   - move of the 32kHz timer on OMAP to a proper timesource
   - Misc cleanup of older OMAP material (incl removal of one board
     file)
   - Switch over to new common PWM lookup support for several platforms

  There's also a handful of other cleanups across the tree, but the
  above are the major pieces"

* tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (103 commits)
  ARM: OMAP3: hwmod data: Remove legacy mailbox data and addrs
  ARM: DRA7: hwmod data: Remove spinlock hwmod addrs
  ARM: OMAP4: hwmod data: Remove spinlock hwmod addrs
  ARM: DRA7/AM335x/AM437x: hwmod: Remove gpmc address space from hwmod data
  ARM: Remove __ref on hotplug cpu die path
  ARM: Remove open-coded version of IRQCHIP_DECLARE
  arm: omap2: board-generic: use omap4_local_timer_init for AM437x
  ARM: DRA7/AM335x/AM437x: hwmod: Remove elm address space from hwmod data
  ARM: OMAP: Remove duplicated operand in OR operation
  clocksource: ti-32k: make it depend on GENERIC_CLOCKSOURCE
  ARM: pxa: remove incorrect __init annotation on pxa27x_set_pwrmode
  ARM: pxa: raumfeld: make some variables static
  ARM: OMAP: Change all cpu_is_* occurences to soc_is_* for id.c
  ARM: OMAP2+: Rename cpu_is macros to soc_is
  arm: omap2: timer: limit hwmod usage to non-DT boots
  arm: omap2+: select 32k clocksource driver
  clocksource: add TI 32.768 Hz counter driver
  arm: omap2: timer: rename omap_sync32k_timer_init()
  arm: omap2: timer: always call clocksource_of_init() when DT
  arm: omap2: timer: move realtime_counter_init() around
  ...
---

a5e1d715a8d0696961d99d31d869aa522f1cad5a
diff --cc arch/arm/Kconfig
index 9246bd7cc3cf,471a3670cd3e..0365cbbc9179
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -621,31 -621,8 +621,9 @@@ config ARCH_PX
  	help
  	  Support for Intel/Marvell's PXA2xx/PXA3xx processor line.
  
- config ARCH_SHMOBILE_LEGACY
- 	bool "Renesas ARM SoCs (non-multiplatform)"
- 	select ARCH_SHMOBILE
- 	select ARM_PATCH_PHYS_VIRT if MMU
- 	select CLKDEV_LOOKUP
- 	select CPU_V7
- 	select GENERIC_CLOCKEVENTS
- 	select HAVE_ARM_SCU if SMP
- 	select HAVE_ARM_TWD if SMP
- 	select HAVE_SMP
- 	select MIGHT_HAVE_CACHE_L2X0
- 	select MULTI_IRQ_HANDLER
- 	select NO_IOPORT_MAP
- 	select PINCTRL
- 	select PM_GENERIC_DOMAINS if PM
- 	select SH_CLK_CPG
- 	select SPARSE_IRQ
- 	help
- 	  Support for Renesas ARM SoC platforms using a non-multiplatform
- 	  kernel. This includes the SH-Mobile, R-Mobile, EMMA-Mobile, R-Car
- 	  and RZ families.
- 
  config ARCH_RPC
  	bool "RiscPC"
 +	depends on MMU
  	select ARCH_ACORN
  	select ARCH_MAY_HAVE_PC_FDC
  	select ARCH_SPARSEMEM_ENABLE
diff --cc arch/arm/mach-omap2/Kconfig
index ddf912406ce8,dc793cc60965..5076d3f334d2
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@@ -96,7 -94,9 +96,8 @@@ config ARCH_OMAP2PLU
  	select OMAP_GPMC
  	select PINCTRL
  	select SOC_BUS
 -	select TI_PRIV_EDMA
  	select OMAP_IRQCHIP
+ 	select CLKSRC_TI_32K
  	help
  	  Systems based on OMAP2, OMAP3, OMAP4 or OMAP5
  
diff --cc arch/arm/mach-omap2/timer.c
index bef41837bf7f,05c17eb2f2d9..b18ebbefae09
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@@ -476,7 -469,64 +469,64 @@@ static void __init omap2_gptimer_clocks
  			clocksource_gpt.name, clksrc.rate);
  }
  
- #ifdef CONFIG_SOC_HAS_REALTIME_COUNTER
+ static void __init __omap_sync32k_timer_init(int clkev_nr, const char *clkev_src,
+ 		const char *clkev_prop, int clksrc_nr, const char *clksrc_src,
+ 		const char *clksrc_prop, bool gptimer)
+ {
+ 	omap_clk_init();
+ 	omap_dmtimer_init();
+ 	omap2_gp_clockevent_init(clkev_nr, clkev_src, clkev_prop);
+ 
+ 	/* Enable the use of clocksource="gp_timer" kernel parameter */
+ 	if (use_gptimer_clksrc || gptimer)
+ 		omap2_gptimer_clocksource_init(clksrc_nr, clksrc_src,
+ 						clksrc_prop);
+ 	else
+ 		omap2_sync32k_clocksource_init();
+ }
+ 
+ void __init omap_init_time(void)
+ {
+ 	__omap_sync32k_timer_init(1, "timer_32k_ck", "ti,timer-alwon",
+ 			2, "timer_sys_ck", NULL, false);
+ 
+ 	if (of_have_populated_dt())
 -		clocksource_of_init();
++		clocksource_probe();
+ }
+ 
+ #if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM43XX)
+ void __init omap3_secure_sync32k_timer_init(void)
+ {
+ 	__omap_sync32k_timer_init(12, "secure_32k_fck", "ti,timer-secure",
+ 			2, "timer_sys_ck", NULL, false);
+ }
+ #endif /* CONFIG_ARCH_OMAP3 */
+ 
+ #if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX)
+ void __init omap3_gptimer_timer_init(void)
+ {
+ 	__omap_sync32k_timer_init(2, "timer_sys_ck", NULL,
+ 			1, "timer_sys_ck", "ti,timer-alwon", true);
+ }
+ #endif
+ 
+ #if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) ||		\
+ 	defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX)
+ static void __init omap4_sync32k_timer_init(void)
+ {
+ 	__omap_sync32k_timer_init(1, "timer_32k_ck", "ti,timer-alwon",
+ 			2, "sys_clkin_ck", NULL, false);
+ }
+ 
+ void __init omap4_local_timer_init(void)
+ {
+ 	omap4_sync32k_timer_init();
 -	clocksource_of_init();
++	clocksource_probe();
+ }
+ #endif
+ 
+ #if defined(CONFIG_SOC_OMAP5) || defined(CONFIG_SOC_DRA7XX)
+ 
  /*
   * The realtime counter also called master counter, is a free-running
   * counter, which is related to real time. It produces the count used