Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip

[platform/adaptation/renesas_rcar/renesas_kernel.git] / arch / sh / kernel / cpu / clock-cpg.c

diff --git a/arch/sh/kernel/cpu/clock-cpg.c b/arch/sh/kernel/cpu/clock-cpg.c
index f59b1f3..8525a67 100644 (file)
--- a/arch/sh/kernel/cpu/clock-cpg.c
+++ b/arch/sh/kernel/cpu/clock-cpg.c
@@ -56,9 +56,13 @@ int __init __deprecated cpg_clk_init(void)
 
        clkdev_add_table(lookups, ARRAY_SIZE(lookups));
 
-       clk_add_alias("tmu_fck", NULL, "peripheral_clk", NULL);
-       clk_add_alias("mtu2_fck", NULL, "peripheral_clk", NULL);
-       clk_add_alias("cmt_fck", NULL, "peripheral_clk", NULL);
+       clk_add_alias("fck", "sh-tmu-sh3.0", "peripheral_clk", NULL);
+       clk_add_alias("fck", "sh-tmu.0", "peripheral_clk", NULL);
+       clk_add_alias("fck", "sh-tmu.1", "peripheral_clk", NULL);
+       clk_add_alias("fck", "sh-tmu.2", "peripheral_clk", NULL);
+       clk_add_alias("fck", "sh-mtu2", "peripheral_clk", NULL);
+       clk_add_alias("fck", "sh-cmt-16.0", "peripheral_clk", NULL);
+       clk_add_alias("fck", "sh-cmt-32.0", "peripheral_clk", NULL);
        clk_add_alias("sci_ick", NULL, "peripheral_clk", NULL);
 
        return ret;