ARM: OMAP2+: clock data: Remove redundant timer clkdev

The commit 318c3e15cd55c73a26ae22a65a8183655b3003f9
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 <b-cousson@ti.com>
Cc: Tarun Kanti DebBarma <tarun.kanti@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/clock2420_data.c b/arch/arm/mach-omap2/clock2420_data.c
index 14a6277dd184c0e27323efbd1cef5161c3c60562..61ad3855f10a61e479e994d547e9d0955aed166d 100644 (file)
--- a/arch/arm/mach-omap2/clock2420_data.c
+++ b/arch/arm/mach-omap2/clock2420_data.c
@@ -1898,18 +1898,6 @@ 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",     "fck",  &gpt1_fck,      CK_242X),
-       CLK("omap_timer.2",     "fck",  &gpt2_fck,      CK_242X),
-       CLK("omap_timer.3",     "fck",  &gpt3_fck,      CK_242X),
-       CLK("omap_timer.4",     "fck",  &gpt4_fck,      CK_242X),
-       CLK("omap_timer.5",     "fck",  &gpt5_fck,      CK_242X),
-       CLK("omap_timer.6",     "fck",  &gpt6_fck,      CK_242X),
-       CLK("omap_timer.7",     "fck",  &gpt7_fck,      CK_242X),
-       CLK("omap_timer.8",     "fck",  &gpt8_fck,      CK_242X),
-       CLK("omap_timer.9",     "fck",  &gpt9_fck,      CK_242X),
-       CLK("omap_timer.10",    "fck",  &gpt10_fck,     CK_242X),
-       CLK("omap_timer.11",    "fck",  &gpt11_fck,     CK_242X),
-       CLK("omap_timer.12",    "fck",  &gpt12_fck,     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),

diff --git a/arch/arm/mach-omap2/clock2430_data.c b/arch/arm/mach-omap2/clock2430_data.c
index ea6717cfa3c84245b390502349eb262850e7df23..0cc12879e7b955b1bee0e256e597d34c42b51f57 100644 (file)
--- a/arch/arm/mach-omap2/clock2430_data.c
+++ b/arch/arm/mach-omap2/clock2430_data.c
@@ -1998,18 +1998,6 @@ 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",     "fck",  &gpt1_fck,      CK_243X),
-       CLK("omap_timer.2",     "fck",  &gpt2_fck,      CK_243X),
-       CLK("omap_timer.3",     "fck",  &gpt3_fck,      CK_243X),
-       CLK("omap_timer.4",     "fck",  &gpt4_fck,      CK_243X),
-       CLK("omap_timer.5",     "fck",  &gpt5_fck,      CK_243X),
-       CLK("omap_timer.6",     "fck",  &gpt6_fck,      CK_243X),
-       CLK("omap_timer.7",     "fck",  &gpt7_fck,      CK_243X),
-       CLK("omap_timer.8",     "fck",  &gpt8_fck,      CK_243X),
-       CLK("omap_timer.9",     "fck",  &gpt9_fck,      CK_243X),
-       CLK("omap_timer.10",    "fck",  &gpt10_fck,     CK_243X),
-       CLK("omap_timer.11",    "fck",  &gpt11_fck,     CK_243X),
-       CLK("omap_timer.12",    "fck",  &gpt12_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),

diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
index 65dd363163bccdfa6890b112458aac36e1b7f704..5d0064a4fb5a638bb1141489354244e95899c1a1 100644 (file)
--- a/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/arch/arm/mach-omap2/clock3xxx_data.c
@@ -3464,18 +3464,6 @@ 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",     "fck",  &gpt1_fck,      CK_3XXX),
-       CLK("omap_timer.2",     "fck",  &gpt2_fck,      CK_3XXX),
-       CLK("omap_timer.3",     "fck",  &gpt3_fck,      CK_3XXX),
-       CLK("omap_timer.4",     "fck",  &gpt4_fck,      CK_3XXX),
-       CLK("omap_timer.5",     "fck",  &gpt5_fck,      CK_3XXX),
-       CLK("omap_timer.6",     "fck",  &gpt6_fck,      CK_3XXX),
-       CLK("omap_timer.7",     "fck",  &gpt7_fck,      CK_3XXX),
-       CLK("omap_timer.8",     "fck",  &gpt8_fck,      CK_3XXX),
-       CLK("omap_timer.9",     "fck",  &gpt9_fck,      CK_3XXX),
-       CLK("omap_timer.10",    "fck",  &gpt10_fck,     CK_3XXX),
-       CLK("omap_timer.11",    "fck",  &gpt11_fck,     CK_3XXX),
-       CLK("omap_timer.12",    "fck",  &gpt12_fck,     CK_3XXX),
        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),

diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c
index cbf9b68d4b94a08fa470303fb823b6d9bc5f4666..0798a802497a543dbfc2bff9b71da28772ffa6be 100644 (file)
--- a/arch/arm/mach-omap2/clock44xx_data.c
+++ b/arch/arm/mach-omap2/clock44xx_data.c
@@ -3377,17 +3377,6 @@ static struct omap_clk omap44xx_clks[] = {
        CLK("usbhs-omap.0",     "usbhost_ick",          &dummy_ck,              CK_443X),
        CLK("usbhs-omap.0",     "usbtll_fck",           &dummy_ck,      CK_443X),
        CLK("omap_wdt", "ick",                          &dummy_ck,      CK_443X),
-       CLK("omap_timer.1",     "fck",                  &timer1_fck,    CK_443X),
-       CLK("omap_timer.2",     "fck",                  &timer2_fck,    CK_443X),
-       CLK("omap_timer.3",     "fck",                  &timer3_fck,    CK_443X),
-       CLK("omap_timer.4",     "fck",                  &timer4_fck,    CK_443X),
-       CLK("omap_timer.5",     "fck",                  &timer5_fck,    CK_443X),
-       CLK("omap_timer.6",     "fck",                  &timer6_fck,    CK_443X),
-       CLK("omap_timer.7",     "fck",                  &timer7_fck,    CK_443X),
-       CLK("omap_timer.8",     "fck",                  &timer8_fck,    CK_443X),
-       CLK("omap_timer.9",     "fck",                  &timer9_fck,    CK_443X),
-       CLK("omap_timer.10",    "fck",                  &timer10_fck,   CK_443X),
-       CLK("omap_timer.11",    "fck",                  &timer11_fck,   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),