From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 23 Jul 2012 23:21:23 +0000 (-0700)
Subject: Merge tag 'timer' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: v3.6-rc1~142
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1a4120bc101bdc25ec7258937b5071bf34b19cc5;p=~emulex%2Finfiniband.git

Merge tag 'timer' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull arm-soc timer updates from Arnd Bergmann:
 "This contains two branches dealing with timers, one for the picoxcell
  platform that is now using DT with the platform-independent
  dw_apb_timer driver.  The other change is for the omap-specific
  dmtimer driver."

* tag 'timer' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  clocksource: dw_apb_timer: Add common DTS glue for dw_apb_timer
  ARM: OMAP2+: Simplify dmtimer clock aliases
  ARM: OMAP2+: Move dmtimer clock set function to dmtimer driver
  ARM: OMAP1: Fix dmtimer support
  ARM: OMAP: Add flag to indicate if a timer needs a manual reset
  ARM: OMAP: Remove timer function pointer for context loss counter
  ARM: OMAP: Remove loses_context variable from timer platform data
  ARM: OMAP2+: Fix external clock support for dmtimers
  ARM: OMAP2+: HWMOD: Correct timer device attributes
  ARM: OMAP: Add DMTIMER capability variable to represent timer features
  ARM: OMAP2+: Add dmtimer platform function to reserve systimers
  ARM: OMAP2+: Remove unused max number of timers definition
  ARM: OMAP: Remove unnecessary clk structure
---

1a4120bc101bdc25ec7258937b5071bf34b19cc5
diff --cc arch/arm/mach-omap2/clock3xxx_data.c
index 049061778a8,0d814620b69..51f7430f6d3
--- a/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/arch/arm/mach-omap2/clock3xxx_data.c
@@@ -3472,34 -3478,12 +3472,12 @@@ static struct omap_clk omap3xxx_clks[] 
  	CLK("davinci_mdio.0",	NULL,	&emac_fck,	CK_AM35XX),
  	CLK("vpfe-capture",	"master",	&vpfe_ick,	CK_AM35XX),
  	CLK("vpfe-capture",	"slave",	&vpfe_fck,	CK_AM35XX),
 -	CLK("musb-am35x",	"ick",		&hsotgusb_ick_am35xx,	CK_AM35XX),
 -	CLK("musb-am35x",	"fck",		&hsotgusb_fck_am35xx,	CK_AM35XX),
 +	CLK(NULL,	"hsotgusb_ick",		&hsotgusb_ick_am35xx,	CK_AM35XX),
 +	CLK(NULL,	"hsotgusb_fck",		&hsotgusb_fck_am35xx,	CK_AM35XX),
  	CLK(NULL,	"hecc_ck",	&hecc_ck,	CK_AM35XX),
  	CLK(NULL,	"uart4_ick",	&uart4_ick_am35xx,	CK_AM35XX),
- 	CLK("omap_timer.1",	"32k_ck",	&omap_32k_fck,  CK_3XXX),
- 	CLK("omap_timer.2",	"32k_ck",	&omap_32k_fck,  CK_3XXX),
- 	CLK("omap_timer.3",	"32k_ck",	&omap_32k_fck,  CK_3XXX),
- 	CLK("omap_timer.4",	"32k_ck",	&omap_32k_fck,  CK_3XXX),
- 	CLK("omap_timer.5",	"32k_ck",	&omap_32k_fck,  CK_3XXX),
- 	CLK("omap_timer.6",	"32k_ck",	&omap_32k_fck,  CK_3XXX),
- 	CLK("omap_timer.7",	"32k_ck",	&omap_32k_fck,  CK_3XXX),
- 	CLK("omap_timer.8",	"32k_ck",	&omap_32k_fck,  CK_3XXX),
- 	CLK("omap_timer.9",	"32k_ck",	&omap_32k_fck,  CK_3XXX),
- 	CLK("omap_timer.10",	"32k_ck",	&omap_32k_fck,  CK_3XXX),
- 	CLK("omap_timer.11",	"32k_ck",	&omap_32k_fck,  CK_3XXX),
- 	CLK("omap_timer.12",	"32k_ck",	&omap_32k_fck,  CK_3XXX),
- 	CLK("omap_timer.1",	"sys_ck",	&sys_ck,	CK_3XXX),
- 	CLK("omap_timer.2",	"sys_ck",	&sys_ck,	CK_3XXX),
- 	CLK("omap_timer.3",	"sys_ck",	&sys_ck,	CK_3XXX),
- 	CLK("omap_timer.4",	"sys_ck",	&sys_ck,	CK_3XXX),
- 	CLK("omap_timer.5",	"sys_ck",	&sys_ck,	CK_3XXX),
- 	CLK("omap_timer.6",	"sys_ck",	&sys_ck,	CK_3XXX),
- 	CLK("omap_timer.7",	"sys_ck",	&sys_ck,	CK_3XXX),
- 	CLK("omap_timer.8",	"sys_ck",	&sys_ck,	CK_3XXX),
- 	CLK("omap_timer.9",	"sys_ck",	&sys_ck,	CK_3XXX),
- 	CLK("omap_timer.10",	"sys_ck",	&sys_ck,	CK_3XXX),
- 	CLK("omap_timer.11",	"sys_ck",	&sys_ck,	CK_3XXX),
- 	CLK("omap_timer.12",	"sys_ck",	&sys_ck,	CK_3XXX),
+ 	CLK(NULL,	"timer_32k_ck",	&omap_32k_fck,  CK_3XXX),
+ 	CLK(NULL,	"timer_sys_ck",	&sys_ck,	CK_3XXX),
  };