Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5351da96 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-devel-dmtimer-for-v3.6' of... 

Merge tag 'omap-devel-dmtimer-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/timer

From Tony Lindgren <tony@atomide.com>:

Here are some omap dmtimer changes to make it easier to add
device tree support for dmtimer by simplifying the platform
data structure used by dmtimr.

* tag 'omap-devel-dmtimer-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  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

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 6887a413 c59b537d

arch/arm/mach-omap1/timer.c

+2 −1
Original line number Diff line number Diff line
@@ -140,7 +140,8 @@ static int __init omap1_dm_timer_init(void) 
		}



		pdata->set_timer_src = omap1_dm_timer_set_src;

		pdata->needs_manual_reset = 1;

		pdata->timer_capability = OMAP_TIMER_ALWON |

				OMAP_TIMER_NEEDS_RESET;



		ret = platform_device_add_data(pdev, pdata, sizeof(*pdata));

		if (ret) {

arch/arm/mach-omap2/clock2420_data.c

+3 −36
Original line number Diff line number Diff line
@@ -1901,42 +1901,9 @@ static struct omap_clk omap2420_clks[] = { 
	CLK(NULL,	"pka_ick",	&pka_ick,	CK_242X),

	CLK(NULL,	"usb_fck",	&usb_fck,	CK_242X),

	CLK("musb-hdrc",	"fck",	&osc_ck,	CK_242X),

	CLK("omap_timer.1",	"32k_ck",	&func_32k_ck,	CK_243X),

	CLK("omap_timer.2",	"32k_ck",	&func_32k_ck,	CK_243X),

	CLK("omap_timer.3",	"32k_ck",	&func_32k_ck,	CK_243X),

	CLK("omap_timer.4",	"32k_ck",	&func_32k_ck,	CK_243X),

	CLK("omap_timer.5",	"32k_ck",	&func_32k_ck,	CK_243X),

	CLK("omap_timer.6",	"32k_ck",	&func_32k_ck,	CK_243X),

	CLK("omap_timer.7",	"32k_ck",	&func_32k_ck,	CK_243X),

	CLK("omap_timer.8",	"32k_ck",	&func_32k_ck,	CK_243X),

	CLK("omap_timer.9",	"32k_ck",	&func_32k_ck,	CK_243X),

	CLK("omap_timer.10",	"32k_ck",	&func_32k_ck,	CK_243X),

	CLK("omap_timer.11",	"32k_ck",	&func_32k_ck,	CK_243X),

	CLK("omap_timer.12",	"32k_ck",	&func_32k_ck,	CK_243X),

	CLK("omap_timer.1",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.2",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.3",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.4",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.5",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.6",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.7",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.8",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.9",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.10",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.11",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.12",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.1",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.2",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.3",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.4",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.5",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.6",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.7",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.8",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.9",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.10",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.11",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.12",	"alt_ck",	&alt_ck,	CK_243X),

	CLK(NULL,	"timer_32k_ck",	&func_32k_ck,	CK_243X),

	CLK(NULL,	"timer_sys_ck",	&sys_ck,	CK_243X),

	CLK(NULL,	"timer_ext_ck",	&alt_ck,	CK_243X),

};



/*

arch/arm/mach-omap2/clock2430_data.c

+3 −36
Original line number Diff line number Diff line
@@ -2000,42 +2000,9 @@ static struct omap_clk omap2430_clks[] = { 
	CLK(NULL,	"mdm_intc_ick",	&mdm_intc_ick,	CK_243X),

	CLK("omap_hsmmc.0", "mmchsdb_fck",	&mmchsdb1_fck,	CK_243X),

	CLK("omap_hsmmc.1", "mmchsdb_fck",	&mmchsdb2_fck,	CK_243X),

	CLK("omap_timer.1",	"32k_ck",  &func_32k_ck,   CK_243X),

	CLK("omap_timer.2",	"32k_ck",  &func_32k_ck,   CK_243X),

	CLK("omap_timer.3",	"32k_ck",  &func_32k_ck,   CK_243X),

	CLK("omap_timer.4",	"32k_ck",  &func_32k_ck,   CK_243X),

	CLK("omap_timer.5",	"32k_ck",  &func_32k_ck,   CK_243X),

	CLK("omap_timer.6",	"32k_ck",  &func_32k_ck,   CK_243X),

	CLK("omap_timer.7",	"32k_ck",  &func_32k_ck,   CK_243X),

	CLK("omap_timer.8",	"32k_ck",  &func_32k_ck,   CK_243X),

	CLK("omap_timer.9",	"32k_ck",  &func_32k_ck,   CK_243X),

	CLK("omap_timer.10",	"32k_ck",  &func_32k_ck,   CK_243X),

	CLK("omap_timer.11",	"32k_ck",  &func_32k_ck,   CK_243X),

	CLK("omap_timer.12",	"32k_ck",  &func_32k_ck,   CK_243X),

	CLK("omap_timer.1",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.2",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.3",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.4",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.5",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.6",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.7",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.8",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.9",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.10",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.11",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.12",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.1",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.2",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.3",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.4",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.5",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.6",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.7",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.8",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.9",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.10",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.11",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.12",	"alt_ck",	&alt_ck,	CK_243X),

	CLK(NULL,	"timer_32k_ck",  &func_32k_ck,   CK_243X),

	CLK(NULL,	"timer_sys_ck",	&sys_ck,	CK_243X),

	CLK(NULL,	"timer_ext_ck",	&alt_ck,	CK_243X),

};



/*

arch/arm/mach-omap2/clock3xxx_data.c

+2 −24
Original line number Diff line number Diff line
@@ -3482,30 +3482,8 @@ static struct omap_clk omap3xxx_clks[] = { 
	CLK("musb-am35x",	"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),

};

arch/arm/mach-omap2/clock44xx_data.c

+12 −22
Original line number Diff line number Diff line
@@ -3385,28 +3385,18 @@ static struct omap_clk omap44xx_clks[] = { 
	CLK("usbhs_omap",	"usbhost_ick",		&dummy_ck,		CK_443X),

	CLK("usbhs_omap",	"usbtll_fck",		&dummy_ck,	CK_443X),

	CLK("omap_wdt",	"ick",				&dummy_ck,	CK_443X),

	CLK("omap_timer.1",	"32k_ck",	&sys_32k_ck,	CK_443X),

	CLK("omap_timer.2",	"32k_ck",	&sys_32k_ck,	CK_443X),

	CLK("omap_timer.3",	"32k_ck",	&sys_32k_ck,	CK_443X),

	CLK("omap_timer.4",	"32k_ck",	&sys_32k_ck,	CK_443X),

	CLK("omap_timer.5",	"32k_ck",	&sys_32k_ck,	CK_443X),

	CLK("omap_timer.6",	"32k_ck",	&sys_32k_ck,	CK_443X),

	CLK("omap_timer.7",	"32k_ck",	&sys_32k_ck,	CK_443X),

	CLK("omap_timer.8",	"32k_ck",	&sys_32k_ck,	CK_443X),

	CLK("omap_timer.9",	"32k_ck",	&sys_32k_ck,	CK_443X),

	CLK("omap_timer.10",	"32k_ck",	&sys_32k_ck,	CK_443X),

	CLK("omap_timer.11",	"32k_ck",	&sys_32k_ck,	CK_443X),

	CLK("omap_timer.1",	"sys_ck",	&sys_clkin_ck,	CK_443X),

	CLK("omap_timer.2",	"sys_ck",	&sys_clkin_ck,	CK_443X),

	CLK("omap_timer.3",	"sys_ck",	&sys_clkin_ck,	CK_443X),

	CLK("omap_timer.4",	"sys_ck",	&sys_clkin_ck,	CK_443X),

	CLK("omap_timer.9",	"sys_ck",	&sys_clkin_ck,	CK_443X),

	CLK("omap_timer.10",	"sys_ck",	&sys_clkin_ck,	CK_443X),

	CLK("omap_timer.11",	"sys_ck",	&sys_clkin_ck,	CK_443X),

	CLK("omap_timer.5",	"sys_ck",	&syc_clk_div_ck,	CK_443X),

	CLK("omap_timer.6",	"sys_ck",	&syc_clk_div_ck,	CK_443X),

	CLK("omap_timer.7",	"sys_ck",	&syc_clk_div_ck,	CK_443X),

	CLK("omap_timer.8",	"sys_ck",	&syc_clk_div_ck,	CK_443X),

	CLK(NULL,	"timer_32k_ck",	&sys_32k_ck,	CK_443X),

	CLK("omap_timer.1",	"timer_sys_ck",	&sys_clkin_ck,	CK_443X),

	CLK("omap_timer.2",	"timer_sys_ck",	&sys_clkin_ck,	CK_443X),

	CLK("omap_timer.3",	"timer_sys_ck",	&sys_clkin_ck,	CK_443X),

	CLK("omap_timer.4",	"timer_sys_ck",	&sys_clkin_ck,	CK_443X),

	CLK("omap_timer.9",	"timer_sys_ck",	&sys_clkin_ck,	CK_443X),

	CLK("omap_timer.10",	"timer_sys_ck",	&sys_clkin_ck,	CK_443X),

	CLK("omap_timer.11",	"timer_sys_ck",	&sys_clkin_ck,	CK_443X),

	CLK("omap_timer.5",	"timer_sys_ck",	&syc_clk_div_ck,	CK_443X),

	CLK("omap_timer.6",	"timer_sys_ck",	&syc_clk_div_ck,	CK_443X),

	CLK("omap_timer.7",	"timer_sys_ck",	&syc_clk_div_ck,	CK_443X),

	CLK("omap_timer.8",	"timer_sys_ck",	&syc_clk_div_ck,	CK_443X),

};



int __init omap4xxx_clk_init(void)