From: Olof Johansson <olof@lixom.net>
Date: Fri, 30 Nov 2012 06:30:11 +0000 (-0800)
Subject: Merge tag 'omap-for-v3.8/cleanup-timer-signed' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: firefly_0821_release~3680^2~1485^2~3
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c8a1ceccf394b2f99feed2b702732140e9f0f92d;p=firefly-linux-kernel-4.4.55.git

Merge tag 'omap-for-v3.8/cleanup-timer-signed' of git://git./linux/kernel/git/tmlind/linux-omap into next/cleanup

Timer clean-up to get us closer to moving timer code to drivers,
and to get rid of CONFIG_OMAP_32K_TIMER and rely on the board
or devicetree provided timer configuration.

Note that these changes are on top of the recent timer fixes.

By Jon Hunter (32) and others
via Tony Lindgren
* tag 'omap-for-v3.8/cleanup-timer-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (71 commits)
  ARM: OMAP3: cm-t3517: use GPTIMER for system clock
  ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER
  ARM: OMAP2+: Fix compiler warning for 32k timer
  ARM: OMAP: Remove unnecessary inclusion of dmtimer.h
  ARM: OMAP: Add platform data header for DMTIMERs
  ARM: OMAP: Remove unnecessary omap_dm_timer structure declaration
  ARM: OMAP2+: Remove unnecessary local variable in timer code
  ARM: OMAP: Don't store timers physical address
  ARM: OMAP: Define omap_dm_timer_prepare function as static
  ARM: OMAP: Clean-up dmtimer reset code
  ARM: OMAP: Remove __omap_dm_timer_set_source function
  ARM: OMAP: Remove unnecessary call to clk_get()
  ARM: OMAP: Add dmtimer interrupt disable function
  ARM: OMAP: Fix spurious interrupts when using timer match feature
  ARM: OMAP: Don't restore DMTIMER interrupt status register
  ARM: OMAP: Don't restore of DMTIMER TISTAT register
  ARM: OMAP: Fix dmtimer reset for timer1
  ARM: OMAP2+: Don't use __omap_dm_timer_reset()
  ARM: OMAP2/3: Define HWMOD software reset status for DMTIMERs
  ARM: OMAP3: Correct HWMOD DMTIMER SYSC register declarations
  ...

Change/change conflict in arch/arm/mach-omap2/board-cm-t3517.c.

Signed-off-by: Olof Johansson <olof@lixom.net>
---

c8a1ceccf394b2f99feed2b702732140e9f0f92d
diff --cc arch/arm/mach-omap2/board-cm-t3517.c
index 699caec8f9e2,54930c9a3b18..ebbc2adb499e
--- a/arch/arm/mach-omap2/board-cm-t3517.c
+++ b/arch/arm/mach-omap2/board-cm-t3517.c
@@@ -297,6 -297,6 +297,6 @@@ MACHINE_START(CM_T3517, "Compulab CM-T3
  	.handle_irq	= omap3_intc_handle_irq,
  	.init_machine	= cm_t3517_init,
  	.init_late	= am35xx_init_late,
- 	.timer		= &omap3_timer,
+ 	.timer		= &omap3_gp_timer,
 -	.restart	= omap_prcm_restart,
 +	.restart	= omap3xxx_restart,
  MACHINE_END
diff --cc arch/arm/mach-omap2/board-generic.c
index 475e14f07216,d69018028d96..aa6e4a19dd90
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@@ -95,8 -95,25 +95,25 @@@ 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,
+ MACHINE_END
  #endif
  
  #ifdef CONFIG_SOC_AM33XX