]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
clk: ti: OMAP5: Correct the DT clock aliases for timers
authorSuman Anna <s-anna@ti.com>
Fri, 13 Mar 2015 22:58:36 +0000 (17:58 -0500)
committerTero Kristo <t-kristo@ti.com>
Tue, 24 Mar 2015 18:23:50 +0000 (20:23 +0200)
The DT clock aliases for Timers use the legacy (non-DT) device
names and a source clock named sys_ck. OMAP5 is DT-boot only,
so correct the DT clock aliases to use the DT device names
instead. Also, the source clock name is corrected from 'sys_ck'
to 'timer_sys_ck', the name used by the OMAP dmtimer driver.

Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tero Kristo <t-kristo@ti.com>
drivers/clk/ti/clk-54xx.c

index 14160b2235480f1b2855a5c1f3d16865321ce18a..96c69a335975a2a7cdccbd4060389f6e79378ba1 100644 (file)
@@ -208,17 +208,17 @@ static struct ti_dt_clk omap54xx_clks[] = {
        DT_CLK("usbhs_omap", "usbtll_fck", "dummy_ck"),
        DT_CLK("omap_wdt", "ick", "dummy_ck"),
        DT_CLK(NULL, "timer_32k_ck", "sys_32k_ck"),
-       DT_CLK("omap_timer.1", "sys_ck", "sys_clkin"),
-       DT_CLK("omap_timer.2", "sys_ck", "sys_clkin"),
-       DT_CLK("omap_timer.3", "sys_ck", "sys_clkin"),
-       DT_CLK("omap_timer.4", "sys_ck", "sys_clkin"),
-       DT_CLK("omap_timer.9", "sys_ck", "sys_clkin"),
-       DT_CLK("omap_timer.10", "sys_ck", "sys_clkin"),
-       DT_CLK("omap_timer.11", "sys_ck", "sys_clkin"),
-       DT_CLK("omap_timer.5", "sys_ck", "dss_syc_gfclk_div"),
-       DT_CLK("omap_timer.6", "sys_ck", "dss_syc_gfclk_div"),
-       DT_CLK("omap_timer.7", "sys_ck", "dss_syc_gfclk_div"),
-       DT_CLK("omap_timer.8", "sys_ck", "dss_syc_gfclk_div"),
+       DT_CLK("4ae18000.timer", "timer_sys_ck", "sys_clkin"),
+       DT_CLK("48032000.timer", "timer_sys_ck", "sys_clkin"),
+       DT_CLK("48034000.timer", "timer_sys_ck", "sys_clkin"),
+       DT_CLK("48036000.timer", "timer_sys_ck", "sys_clkin"),
+       DT_CLK("4803e000.timer", "timer_sys_ck", "sys_clkin"),
+       DT_CLK("48086000.timer", "timer_sys_ck", "sys_clkin"),
+       DT_CLK("48088000.timer", "timer_sys_ck", "sys_clkin"),
+       DT_CLK("40138000.timer", "timer_sys_ck", "dss_syc_gfclk_div"),
+       DT_CLK("4013a000.timer", "timer_sys_ck", "dss_syc_gfclk_div"),
+       DT_CLK("4013c000.timer", "timer_sys_ck", "dss_syc_gfclk_div"),
+       DT_CLK("4013e000.timer", "timer_sys_ck", "dss_syc_gfclk_div"),
        { .node_name = NULL },
 };