]> Pileus Git - ~andy/linux/commitdiff
clk: ux500: Add armss clk and fixup smp_twd clk for u8500
authorUlf Hansson <ulf.hansson@linaro.org>
Wed, 10 Oct 2012 11:42:28 +0000 (13:42 +0200)
committerMike Turquette <mturquette@ti.com>
Sat, 10 Nov 2012 00:47:07 +0000 (16:47 -0800)
The new armss clk is a prcmu_scalable_rate clk which represents
the ARMSS clk. This then makes it possible to convert the smp_twd
clk to a fixed factor clock type, using a fixed divider of 2 and
with the armss clk as parent.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
drivers/clk/ux500/u8500_clk.c

index 7bebf1f62c65d6d752c47fb1d12ab649a39875d4..955110db24400001f3db0aeb626d24fe2e61134b 100644 (file)
@@ -206,16 +206,18 @@ void u8500_clk_init(void)
        clk_register_clkdev(clk, "dsilp2", "dsilink.2");
        clk_register_clkdev(clk, "dsilp2", "mcde");
 
-       clk = clk_reg_prcmu_rate("smp_twd", NULL, PRCMU_ARMSS,
-                               CLK_IS_ROOT|CLK_GET_RATE_NOCACHE|
-                               CLK_IGNORE_UNUSED);
+       clk = clk_reg_prcmu_scalable_rate("armss", NULL,
+                               PRCMU_ARMSS, 0, CLK_IS_ROOT|CLK_IGNORE_UNUSED);
+       clk_register_clkdev(clk, "armss", NULL);
+
+       clk = clk_register_fixed_factor(NULL, "smp_twd", "armss",
+                               CLK_IGNORE_UNUSED, 1, 2);
        clk_register_clkdev(clk, NULL, "smp_twd");
 
        /*
         * FIXME: Add special handled PRCMU clocks here:
-        * 1. clk_arm, use PRCMU_ARMCLK.
-        * 2. clkout0yuv, use PRCMU as parent + need regulator + pinctrl.
-        * 3. ab9540_clkout1yuv, see clkout0yuv
+        * 1. clkout0yuv, use PRCMU as parent + need regulator + pinctrl.
+        * 2. ab9540_clkout1yuv, see clkout0yuv
         */
 
        /* PRCC P-clocks */