From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 19 Apr 2013 21:12:42 +0000 (+0200)
Subject: Merge branch 'next/drivers' into late/multiplatform
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=22cf644e03419b4c3d002109b021c7482306f0bf;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'next/drivers' into late/multiplatform

Multiple parts of next/drivers are prerequisites for the final
exynos multiplatform changes, so let's pull in the entire branch.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

22cf644e03419b4c3d002109b021c7482306f0bf
diff --cc arch/arm/mach-omap2/timer.c
index f62b509ed08d,f12aa6c15da4..31ae76481737
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@@ -544,22 -546,19 +546,23 @@@ static inline void __init realtime_coun
  #endif
  
  #define OMAP_SYS_GP_TIMER_INIT(name, clkev_nr, clkev_src, clkev_prop,	\
- 			       clksrc_nr, clksrc_src)			\
+ 			       clksrc_nr, clksrc_src, clksrc_prop)	\
  void __init omap##name##_gptimer_timer_init(void)			\
  {									\
 +	if (omap_clk_init)						\
 +		omap_clk_init();					\
  	omap_dmtimer_init();						\
  	omap2_gp_clockevent_init((clkev_nr), clkev_src, clkev_prop);	\
- 	omap2_gptimer_clocksource_init((clksrc_nr), clksrc_src);	\
+ 	omap2_gptimer_clocksource_init((clksrc_nr), clksrc_src,		\
+ 					clksrc_prop);			\
  }
  
  #define OMAP_SYS_32K_TIMER_INIT(name, clkev_nr, clkev_src, clkev_prop,	\
- 				clksrc_nr, clksrc_src)			\
+ 				clksrc_nr, clksrc_src, clksrc_prop)	\
  void __init omap##name##_sync32k_timer_init(void)		\
  {									\
 +	if (omap_clk_init)						\
 +		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 */	\