Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...

[firefly-linux-kernel-4.4.55.git] / drivers / clk / ti / clk-54xx.c

diff --git a/drivers/clk/ti/clk-54xx.c b/drivers/clk/ti/clk-54xx.c
index 14160b2235480f1b2855a5c1f3d16865321ce18a..96c69a335975a2a7cdccbd4060389f6e79378ba1 100644 (file)
--- a/drivers/clk/ti/clk-54xx.c
+++ b/drivers/clk/ti/clk-54xx.c
@@ -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 },
 };