Skip to content

Commit 2847111

Browse files
Benoit Coussontmlind
authored andcommitted
ARM: OMAP2+: clock data: Remove redundant timer clkdev
The commit 318c3e1 added some "fck" clock alias to timer devices that are not needed anymore since hwmod framework will create them automatically. A warning was added to highlight and thus fix the redundancy. [ 0.616424] omap_timer.1: alias fck already exists [ 0.621948] omap_timer.2: alias fck already exists [ 0.627380] omap_timer.3: alias fck already exists [ 0.632781] omap_timer.4: alias fck already exists [ 0.638214] omap_timer.5: alias fck already exists [ 0.643615] omap_timer.6: alias fck already exists [ 0.649078] omap_timer.7: alias fck already exists [ 0.654479] omap_timer.8: alias fck already exists [ 0.659881] omap_timer.9: alias fck already exists [ 0.665283] omap_timer.10: alias fck already exists [ 0.670776] omap_timer.11: alias fck already exists Remove all the clkdev entries for timer fck alias. Signed-off-by: Benoit Cousson <[email protected]> Cc: Tarun Kanti DebBarma <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
1 parent e9614f3 commit 2847111

File tree

4 files changed

+0
-47
lines changed

4 files changed

+0
-47
lines changed

arch/arm/mach-omap2/clock2420_data.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1898,18 +1898,6 @@ 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),
19131901
CLK("omap_timer.1", "32k_ck", &func_32k_ck, CK_243X),
19141902
CLK("omap_timer.2", "32k_ck", &func_32k_ck, CK_243X),
19151903
CLK("omap_timer.3", "32k_ck", &func_32k_ck, CK_243X),

arch/arm/mach-omap2/clock2430_data.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1998,18 +1998,6 @@ 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),
20132001
CLK("omap_timer.1", "32k_ck", &func_32k_ck, CK_243X),
20142002
CLK("omap_timer.2", "32k_ck", &func_32k_ck, CK_243X),
20152003
CLK("omap_timer.3", "32k_ck", &func_32k_ck, CK_243X),

arch/arm/mach-omap2/clock3xxx_data.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3464,18 +3464,6 @@ 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),
34793467
CLK("omap_timer.1", "32k_ck", &omap_32k_fck, CK_3XXX),
34803468
CLK("omap_timer.2", "32k_ck", &omap_32k_fck, CK_3XXX),
34813469
CLK("omap_timer.3", "32k_ck", &omap_32k_fck, CK_3XXX),

arch/arm/mach-omap2/clock44xx_data.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3377,17 +3377,6 @@ static struct omap_clk omap44xx_clks[] = {
33773377
CLK("usbhs-omap.0", "usbhost_ick", &dummy_ck, CK_443X),
33783378
CLK("usbhs-omap.0", "usbtll_fck", &dummy_ck, CK_443X),
33793379
CLK("omap_wdt", "ick", &dummy_ck, CK_443X),
3380-
CLK("omap_timer.1", "fck", &timer1_fck, CK_443X),
3381-
CLK("omap_timer.2", "fck", &timer2_fck, CK_443X),
3382-
CLK("omap_timer.3", "fck", &timer3_fck, CK_443X),
3383-
CLK("omap_timer.4", "fck", &timer4_fck, CK_443X),
3384-
CLK("omap_timer.5", "fck", &timer5_fck, CK_443X),
3385-
CLK("omap_timer.6", "fck", &timer6_fck, CK_443X),
3386-
CLK("omap_timer.7", "fck", &timer7_fck, CK_443X),
3387-
CLK("omap_timer.8", "fck", &timer8_fck, CK_443X),
3388-
CLK("omap_timer.9", "fck", &timer9_fck, CK_443X),
3389-
CLK("omap_timer.10", "fck", &timer10_fck, CK_443X),
3390-
CLK("omap_timer.11", "fck", &timer11_fck, CK_443X),
33913380
CLK("omap_timer.1", "32k_ck", &sys_32k_ck, CK_443X),
33923381
CLK("omap_timer.2", "32k_ck", &sys_32k_ck, CK_443X),
33933382
CLK("omap_timer.3", "32k_ck", &sys_32k_ck, CK_443X),

0 commit comments

Comments
 (0)