Skip to content

Commit 318c3e1

Browse files
Tarun Kanti DebBarmatmlind
Tarun Kanti DebBarma
authored and
tmlind
committed
ARM: OMAP2+: dmtimer: add device names to flck nodes
Add device name to OMAP2 dmtimer fclk nodes so that the fclk nodes can be retrieved by doing a clk_get with the corresponding device pointers or device names. Reviewed-by: Santosh Shilimkar <[email protected]> Signed-off-by: Tarun Kanti DebBarma <[email protected]> Signed-off-by: Thara Gopinath <[email protected]> Acked-by: Cousson, Benoit <[email protected]> [[email protected]: fixed typo in email address] Signed-off-by: Tony Lindgren <[email protected]>
1 parent ee17f11 commit 318c3e1

File tree

4 files changed

+165
-0
lines changed

4 files changed

+165
-0
lines changed

‎arch/arm/mach-omap2/clock2420_data.c

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1898,6 +1898,54 @@ static struct omap_clk omap2420_clks[] = {
18981898
CLK(NULL, "pka_ick", &pka_ick, CK_242X),
18991899
CLK(NULL, "usb_fck", &usb_fck, CK_242X),
19001900
CLK("musb-hdrc", "fck", &osc_ck, CK_242X),
1901+
CLK("omap_timer.1", "fck", &gpt1_fck, CK_242X),
1902+
CLK("omap_timer.2", "fck", &gpt2_fck, CK_242X),
1903+
CLK("omap_timer.3", "fck", &gpt3_fck, CK_242X),
1904+
CLK("omap_timer.4", "fck", &gpt4_fck, CK_242X),
1905+
CLK("omap_timer.5", "fck", &gpt5_fck, CK_242X),
1906+
CLK("omap_timer.6", "fck", &gpt6_fck, CK_242X),
1907+
CLK("omap_timer.7", "fck", &gpt7_fck, CK_242X),
1908+
CLK("omap_timer.8", "fck", &gpt8_fck, CK_242X),
1909+
CLK("omap_timer.9", "fck", &gpt9_fck, CK_242X),
1910+
CLK("omap_timer.10", "fck", &gpt10_fck, CK_242X),
1911+
CLK("omap_timer.11", "fck", &gpt11_fck, CK_242X),
1912+
CLK("omap_timer.12", "fck", &gpt12_fck, CK_242X),
1913+
CLK("omap_timer.1", "32k_ck", &func_32k_ck, CK_243X),
1914+
CLK("omap_timer.2", "32k_ck", &func_32k_ck, CK_243X),
1915+
CLK("omap_timer.3", "32k_ck", &func_32k_ck, CK_243X),
1916+
CLK("omap_timer.4", "32k_ck", &func_32k_ck, CK_243X),
1917+
CLK("omap_timer.5", "32k_ck", &func_32k_ck, CK_243X),
1918+
CLK("omap_timer.6", "32k_ck", &func_32k_ck, CK_243X),
1919+
CLK("omap_timer.7", "32k_ck", &func_32k_ck, CK_243X),
1920+
CLK("omap_timer.8", "32k_ck", &func_32k_ck, CK_243X),
1921+
CLK("omap_timer.9", "32k_ck", &func_32k_ck, CK_243X),
1922+
CLK("omap_timer.10", "32k_ck", &func_32k_ck, CK_243X),
1923+
CLK("omap_timer.11", "32k_ck", &func_32k_ck, CK_243X),
1924+
CLK("omap_timer.12", "32k_ck", &func_32k_ck, CK_243X),
1925+
CLK("omap_timer.1", "sys_ck", &sys_ck, CK_243X),
1926+
CLK("omap_timer.2", "sys_ck", &sys_ck, CK_243X),
1927+
CLK("omap_timer.3", "sys_ck", &sys_ck, CK_243X),
1928+
CLK("omap_timer.4", "sys_ck", &sys_ck, CK_243X),
1929+
CLK("omap_timer.5", "sys_ck", &sys_ck, CK_243X),
1930+
CLK("omap_timer.6", "sys_ck", &sys_ck, CK_243X),
1931+
CLK("omap_timer.7", "sys_ck", &sys_ck, CK_243X),
1932+
CLK("omap_timer.8", "sys_ck", &sys_ck, CK_243X),
1933+
CLK("omap_timer.9", "sys_ck", &sys_ck, CK_243X),
1934+
CLK("omap_timer.10", "sys_ck", &sys_ck, CK_243X),
1935+
CLK("omap_timer.11", "sys_ck", &sys_ck, CK_243X),
1936+
CLK("omap_timer.12", "sys_ck", &sys_ck, CK_243X),
1937+
CLK("omap_timer.1", "alt_ck", &alt_ck, CK_243X),
1938+
CLK("omap_timer.2", "alt_ck", &alt_ck, CK_243X),
1939+
CLK("omap_timer.3", "alt_ck", &alt_ck, CK_243X),
1940+
CLK("omap_timer.4", "alt_ck", &alt_ck, CK_243X),
1941+
CLK("omap_timer.5", "alt_ck", &alt_ck, CK_243X),
1942+
CLK("omap_timer.6", "alt_ck", &alt_ck, CK_243X),
1943+
CLK("omap_timer.7", "alt_ck", &alt_ck, CK_243X),
1944+
CLK("omap_timer.8", "alt_ck", &alt_ck, CK_243X),
1945+
CLK("omap_timer.9", "alt_ck", &alt_ck, CK_243X),
1946+
CLK("omap_timer.10", "alt_ck", &alt_ck, CK_243X),
1947+
CLK("omap_timer.11", "alt_ck", &alt_ck, CK_243X),
1948+
CLK("omap_timer.12", "alt_ck", &alt_ck, CK_243X),
19011949
};
19021950

19031951
/*

‎arch/arm/mach-omap2/clock2430_data.c

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1998,6 +1998,54 @@ static struct omap_clk omap2430_clks[] = {
19981998
CLK(NULL, "mdm_intc_ick", &mdm_intc_ick, CK_243X),
19991999
CLK("omap_hsmmc.0", "mmchsdb_fck", &mmchsdb1_fck, CK_243X),
20002000
CLK("omap_hsmmc.1", "mmchsdb_fck", &mmchsdb2_fck, CK_243X),
2001+
CLK("omap_timer.1", "fck", &gpt1_fck, CK_243X),
2002+
CLK("omap_timer.2", "fck", &gpt2_fck, CK_243X),
2003+
CLK("omap_timer.3", "fck", &gpt3_fck, CK_243X),
2004+
CLK("omap_timer.4", "fck", &gpt4_fck, CK_243X),
2005+
CLK("omap_timer.5", "fck", &gpt5_fck, CK_243X),
2006+
CLK("omap_timer.6", "fck", &gpt6_fck, CK_243X),
2007+
CLK("omap_timer.7", "fck", &gpt7_fck, CK_243X),
2008+
CLK("omap_timer.8", "fck", &gpt8_fck, CK_243X),
2009+
CLK("omap_timer.9", "fck", &gpt9_fck, CK_243X),
2010+
CLK("omap_timer.10", "fck", &gpt10_fck, CK_243X),
2011+
CLK("omap_timer.11", "fck", &gpt11_fck, CK_243X),
2012+
CLK("omap_timer.12", "fck", &gpt12_fck, CK_243X),
2013+
CLK("omap_timer.1", "32k_ck", &func_32k_ck, CK_243X),
2014+
CLK("omap_timer.2", "32k_ck", &func_32k_ck, CK_243X),
2015+
CLK("omap_timer.3", "32k_ck", &func_32k_ck, CK_243X),
2016+
CLK("omap_timer.4", "32k_ck", &func_32k_ck, CK_243X),
2017+
CLK("omap_timer.5", "32k_ck", &func_32k_ck, CK_243X),
2018+
CLK("omap_timer.6", "32k_ck", &func_32k_ck, CK_243X),
2019+
CLK("omap_timer.7", "32k_ck", &func_32k_ck, CK_243X),
2020+
CLK("omap_timer.8", "32k_ck", &func_32k_ck, CK_243X),
2021+
CLK("omap_timer.9", "32k_ck", &func_32k_ck, CK_243X),
2022+
CLK("omap_timer.10", "32k_ck", &func_32k_ck, CK_243X),
2023+
CLK("omap_timer.11", "32k_ck", &func_32k_ck, CK_243X),
2024+
CLK("omap_timer.12", "32k_ck", &func_32k_ck, CK_243X),
2025+
CLK("omap_timer.1", "sys_ck", &sys_ck, CK_243X),
2026+
CLK("omap_timer.2", "sys_ck", &sys_ck, CK_243X),
2027+
CLK("omap_timer.3", "sys_ck", &sys_ck, CK_243X),
2028+
CLK("omap_timer.4", "sys_ck", &sys_ck, CK_243X),
2029+
CLK("omap_timer.5", "sys_ck", &sys_ck, CK_243X),
2030+
CLK("omap_timer.6", "sys_ck", &sys_ck, CK_243X),
2031+
CLK("omap_timer.7", "sys_ck", &sys_ck, CK_243X),
2032+
CLK("omap_timer.8", "sys_ck", &sys_ck, CK_243X),
2033+
CLK("omap_timer.9", "sys_ck", &sys_ck, CK_243X),
2034+
CLK("omap_timer.10", "sys_ck", &sys_ck, CK_243X),
2035+
CLK("omap_timer.11", "sys_ck", &sys_ck, CK_243X),
2036+
CLK("omap_timer.12", "sys_ck", &sys_ck, CK_243X),
2037+
CLK("omap_timer.1", "alt_ck", &alt_ck, CK_243X),
2038+
CLK("omap_timer.2", "alt_ck", &alt_ck, CK_243X),
2039+
CLK("omap_timer.3", "alt_ck", &alt_ck, CK_243X),
2040+
CLK("omap_timer.4", "alt_ck", &alt_ck, CK_243X),
2041+
CLK("omap_timer.5", "alt_ck", &alt_ck, CK_243X),
2042+
CLK("omap_timer.6", "alt_ck", &alt_ck, CK_243X),
2043+
CLK("omap_timer.7", "alt_ck", &alt_ck, CK_243X),
2044+
CLK("omap_timer.8", "alt_ck", &alt_ck, CK_243X),
2045+
CLK("omap_timer.9", "alt_ck", &alt_ck, CK_243X),
2046+
CLK("omap_timer.10", "alt_ck", &alt_ck, CK_243X),
2047+
CLK("omap_timer.11", "alt_ck", &alt_ck, CK_243X),
2048+
CLK("omap_timer.12", "alt_ck", &alt_ck, CK_243X),
20012049
};
20022050

20032051
/*

‎arch/arm/mach-omap2/clock3xxx_data.c

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3464,6 +3464,42 @@ static struct omap_clk omap3xxx_clks[] = {
34643464
CLK("musb-am35x", "fck", &hsotgusb_fck_am35xx, CK_AM35XX),
34653465
CLK(NULL, "hecc_ck", &hecc_ck, CK_AM35XX),
34663466
CLK(NULL, "uart4_ick", &uart4_ick_am35xx, CK_AM35XX),
3467+
CLK("omap_timer.1", "fck", &gpt1_fck, CK_3XXX),
3468+
CLK("omap_timer.2", "fck", &gpt2_fck, CK_3XXX),
3469+
CLK("omap_timer.3", "fck", &gpt3_fck, CK_3XXX),
3470+
CLK("omap_timer.4", "fck", &gpt4_fck, CK_3XXX),
3471+
CLK("omap_timer.5", "fck", &gpt5_fck, CK_3XXX),
3472+
CLK("omap_timer.6", "fck", &gpt6_fck, CK_3XXX),
3473+
CLK("omap_timer.7", "fck", &gpt7_fck, CK_3XXX),
3474+
CLK("omap_timer.8", "fck", &gpt8_fck, CK_3XXX),
3475+
CLK("omap_timer.9", "fck", &gpt9_fck, CK_3XXX),
3476+
CLK("omap_timer.10", "fck", &gpt10_fck, CK_3XXX),
3477+
CLK("omap_timer.11", "fck", &gpt11_fck, CK_3XXX),
3478+
CLK("omap_timer.12", "fck", &gpt12_fck, CK_3XXX),
3479+
CLK("omap_timer.1", "32k_ck", &omap_32k_fck, CK_3XXX),
3480+
CLK("omap_timer.2", "32k_ck", &omap_32k_fck, CK_3XXX),
3481+
CLK("omap_timer.3", "32k_ck", &omap_32k_fck, CK_3XXX),
3482+
CLK("omap_timer.4", "32k_ck", &omap_32k_fck, CK_3XXX),
3483+
CLK("omap_timer.5", "32k_ck", &omap_32k_fck, CK_3XXX),
3484+
CLK("omap_timer.6", "32k_ck", &omap_32k_fck, CK_3XXX),
3485+
CLK("omap_timer.7", "32k_ck", &omap_32k_fck, CK_3XXX),
3486+
CLK("omap_timer.8", "32k_ck", &omap_32k_fck, CK_3XXX),
3487+
CLK("omap_timer.9", "32k_ck", &omap_32k_fck, CK_3XXX),
3488+
CLK("omap_timer.10", "32k_ck", &omap_32k_fck, CK_3XXX),
3489+
CLK("omap_timer.11", "32k_ck", &omap_32k_fck, CK_3XXX),
3490+
CLK("omap_timer.12", "32k_ck", &omap_32k_fck, CK_3XXX),
3491+
CLK("omap_timer.1", "sys_ck", &sys_ck, CK_3XXX),
3492+
CLK("omap_timer.2", "sys_ck", &sys_ck, CK_3XXX),
3493+
CLK("omap_timer.3", "sys_ck", &sys_ck, CK_3XXX),
3494+
CLK("omap_timer.4", "sys_ck", &sys_ck, CK_3XXX),
3495+
CLK("omap_timer.5", "sys_ck", &sys_ck, CK_3XXX),
3496+
CLK("omap_timer.6", "sys_ck", &sys_ck, CK_3XXX),
3497+
CLK("omap_timer.7", "sys_ck", &sys_ck, CK_3XXX),
3498+
CLK("omap_timer.8", "sys_ck", &sys_ck, CK_3XXX),
3499+
CLK("omap_timer.9", "sys_ck", &sys_ck, CK_3XXX),
3500+
CLK("omap_timer.10", "sys_ck", &sys_ck, CK_3XXX),
3501+
CLK("omap_timer.11", "sys_ck", &sys_ck, CK_3XXX),
3502+
CLK("omap_timer.12", "sys_ck", &sys_ck, CK_3XXX),
34673503
};
34683504

34693505

‎arch/arm/mach-omap2/clock44xx_data.c

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3363,6 +3363,39 @@ static struct omap_clk omap44xx_clks[] = {
33633363
CLK("usbhs-omap.0", "usbhost_ick", &dummy_ck, CK_443X),
33643364
CLK("usbhs-omap.0", "usbtll_fck", &dummy_ck, CK_443X),
33653365
CLK("omap_wdt", "ick", &dummy_ck, CK_443X),
3366+
CLK("omap_timer.1", "fck", &timer1_fck, CK_443X),
3367+
CLK("omap_timer.2", "fck", &timer2_fck, CK_443X),
3368+
CLK("omap_timer.3", "fck", &timer3_fck, CK_443X),
3369+
CLK("omap_timer.4", "fck", &timer4_fck, CK_443X),
3370+
CLK("omap_timer.5", "fck", &timer5_fck, CK_443X),
3371+
CLK("omap_timer.6", "fck", &timer6_fck, CK_443X),
3372+
CLK("omap_timer.7", "fck", &timer7_fck, CK_443X),
3373+
CLK("omap_timer.8", "fck", &timer8_fck, CK_443X),
3374+
CLK("omap_timer.9", "fck", &timer9_fck, CK_443X),
3375+
CLK("omap_timer.10", "fck", &timer10_fck, CK_443X),
3376+
CLK("omap_timer.11", "fck", &timer11_fck, CK_443X),
3377+
CLK("omap_timer.1", "32k_ck", &sys_32k_ck, CK_443X),
3378+
CLK("omap_timer.2", "32k_ck", &sys_32k_ck, CK_443X),
3379+
CLK("omap_timer.3", "32k_ck", &sys_32k_ck, CK_443X),
3380+
CLK("omap_timer.4", "32k_ck", &sys_32k_ck, CK_443X),
3381+
CLK("omap_timer.5", "32k_ck", &sys_32k_ck, CK_443X),
3382+
CLK("omap_timer.6", "32k_ck", &sys_32k_ck, CK_443X),
3383+
CLK("omap_timer.7", "32k_ck", &sys_32k_ck, CK_443X),
3384+
CLK("omap_timer.8", "32k_ck", &sys_32k_ck, CK_443X),
3385+
CLK("omap_timer.9", "32k_ck", &sys_32k_ck, CK_443X),
3386+
CLK("omap_timer.10", "32k_ck", &sys_32k_ck, CK_443X),
3387+
CLK("omap_timer.11", "32k_ck", &sys_32k_ck, CK_443X),
3388+
CLK("omap_timer.1", "sys_ck", &sys_clkin_ck, CK_443X),
3389+
CLK("omap_timer.2", "sys_ck", &sys_clkin_ck, CK_443X),
3390+
CLK("omap_timer.3", "sys_ck", &sys_clkin_ck, CK_443X),
3391+
CLK("omap_timer.4", "sys_ck", &sys_clkin_ck, CK_443X),
3392+
CLK("omap_timer.9", "sys_ck", &sys_clkin_ck, CK_443X),
3393+
CLK("omap_timer.10", "sys_ck", &sys_clkin_ck, CK_443X),
3394+
CLK("omap_timer.11", "sys_ck", &sys_clkin_ck, CK_443X),
3395+
CLK("omap_timer.5", "sys_ck", &syc_clk_div_ck, CK_443X),
3396+
CLK("omap_timer.6", "sys_ck", &syc_clk_div_ck, CK_443X),
3397+
CLK("omap_timer.7", "sys_ck", &syc_clk_div_ck, CK_443X),
3398+
CLK("omap_timer.8", "sys_ck", &syc_clk_div_ck, CK_443X),
33663399
};
33673400

33683401
int __init omap4xxx_clk_init(void)

0 commit comments

Comments
 (0)