clk: ux500: Add Device Tree support for the PRCC Kernel clock

This patch enables clocks to be specified from Device Tree via phandles
to the "prcc-kernel-clock" node.

Acked-by: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

1 files changed, 32 insertions, 0 deletions

diff --git a/drivers/clk/ux500/u8500_of_clk.c b/drivers/clk/ux500/u8500_of_clk.c
index dcc736afde77..4fcafd007656 100644
--- a/drivers/clk/ux500/u8500_of_clk.c
+++ b/drivers/clk/ux500/u8500_of_clk.c
@@ -20,11 +20,14 @@
 
 static struct clk *prcmu_clk[PRCMU_NUM_CLKS];
 static struct clk *prcc_pclk[(PRCC_NUM_PERIPH_CLUSTERS + 1) * PRCC_PERIPHS_PER_CLUSTER];
+static struct clk *prcc_kclk[(PRCC_NUM_PERIPH_CLUSTERS + 1) * PRCC_PERIPHS_PER_CLUSTER];
 
 #define PRCC_SHOW(clk, base, bit) \
         clk[(base * PRCC_PERIPHS_PER_CLUSTER) + bit]
 #define PRCC_PCLK_STORE(clk, base, bit) \
         prcc_pclk[(base * PRCC_PERIPHS_PER_CLUSTER) + bit] = clk
+#define PRCC_KCLK_STORE(clk, base, bit)        \
+        prcc_kclk[(base * PRCC_PERIPHS_PER_CLUSTER) + bit] = clk
 
 struct clk *ux500_twocell_get(struct of_phandle_args *clkspec, void *data)
 {
@@ -428,83 +431,109 @@ void u8500_of_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base,
         /* Periph1 */
         clk = clk_reg_prcc_kclk("p1_uart0_kclk", "uartclk",
                         clkrst1_base, BIT(0), CLK_SET_RATE_GATE);
+        PRCC_KCLK_STORE(clk, 1, 0);
 
         clk = clk_reg_prcc_kclk("p1_uart1_kclk", "uartclk",
                         clkrst1_base, BIT(1), CLK_SET_RATE_GATE);
+        PRCC_KCLK_STORE(clk, 1, 1);
 
         clk = clk_reg_prcc_kclk("p1_i2c1_kclk", "i2cclk",
                         clkrst1_base, BIT(2), CLK_SET_RATE_GATE);
+        PRCC_KCLK_STORE(clk, 1, 2);
 
         clk = clk_reg_prcc_kclk("p1_msp0_kclk", "msp02clk",
                         clkrst1_base, BIT(3), CLK_SET_RATE_GATE);
+        PRCC_KCLK_STORE(clk, 1, 3);
 
         clk = clk_reg_prcc_kclk("p1_msp1_kclk", "msp1clk",
                         clkrst1_base, BIT(4), CLK_SET_RATE_GATE);
+        PRCC_KCLK_STORE(clk, 1, 4);
 
         clk = clk_reg_prcc_kclk("p1_sdi0_kclk", "sdmmcclk",
                         clkrst1_base, BIT(5), CLK_SET_RATE_GATE);
+        PRCC_KCLK_STORE(clk, 1, 5);
 
         clk = clk_reg_prcc_kclk("p1_i2c2_kclk", "i2cclk",
                         clkrst1_base, BIT(6), CLK_SET_RATE_GATE);
+        PRCC_KCLK_STORE(clk, 1, 6);
 
         clk = clk_reg_prcc_kclk("p1_slimbus0_kclk", "slimclk",
                         clkrst1_base, BIT(8), CLK_SET_RATE_GATE);
+        PRCC_KCLK_STORE(clk, 1, 8);
 
         clk = clk_reg_prcc_kclk("p1_i2c4_kclk", "i2cclk",
                         clkrst1_base, BIT(9), CLK_SET_RATE_GATE);
+        PRCC_KCLK_STORE(clk, 1, 9);
 
         clk = clk_reg_prcc_kclk("p1_msp3_kclk", "msp1clk",
                         clkrst1_base, BIT(10), CLK_SET_RATE_GATE);
+        PRCC_KCLK_STORE(clk, 1, 10);
 
         /* Periph2 */
         clk = clk_reg_prcc_kclk("p2_i2c3_kclk", "i2cclk",
                         clkrst2_base, BIT(0), CLK_SET_RATE_GATE);
+        PRCC_KCLK_STORE(clk, 2, 0);
 
         clk = clk_reg_prcc_kclk("p2_sdi4_kclk", "sdmmcclk",
                         clkrst2_base, BIT(2), CLK_SET_RATE_GATE);
+        PRCC_KCLK_STORE(clk, 2, 2);
 
         clk = clk_reg_prcc_kclk("p2_msp2_kclk", "msp02clk",
                         clkrst2_base, BIT(3), CLK_SET_RATE_GATE);
+        PRCC_KCLK_STORE(clk, 2, 3);
 
         clk = clk_reg_prcc_kclk("p2_sdi1_kclk", "sdmmcclk",
                         clkrst2_base, BIT(4), CLK_SET_RATE_GATE);
+        PRCC_KCLK_STORE(clk, 2, 4);
 
         clk = clk_reg_prcc_kclk("p2_sdi3_kclk", "sdmmcclk",
                         clkrst2_base, BIT(5), CLK_SET_RATE_GATE);
+        PRCC_KCLK_STORE(clk, 2, 5);
 
         /* Note that rate is received from parent. */
         clk = clk_reg_prcc_kclk("p2_ssirx_kclk", "hsirxclk",
                         clkrst2_base, BIT(6),
                         CLK_SET_RATE_GATE|CLK_SET_RATE_PARENT);
+        PRCC_KCLK_STORE(clk, 2, 6);
+
         clk = clk_reg_prcc_kclk("p2_ssitx_kclk", "hsitxclk",
                         clkrst2_base, BIT(7),
                         CLK_SET_RATE_GATE|CLK_SET_RATE_PARENT);
+        PRCC_KCLK_STORE(clk, 2, 7);
 
         /* Periph3 */
         clk = clk_reg_prcc_kclk("p3_ssp0_kclk", "sspclk",
                         clkrst3_base, BIT(1), CLK_SET_RATE_GATE);
+        PRCC_KCLK_STORE(clk, 3, 1);
 
         clk = clk_reg_prcc_kclk("p3_ssp1_kclk", "sspclk",
                         clkrst3_base, BIT(2), CLK_SET_RATE_GATE);
+        PRCC_KCLK_STORE(clk, 3, 2);
 
         clk = clk_reg_prcc_kclk("p3_i2c0_kclk", "i2cclk",
                         clkrst3_base, BIT(3), CLK_SET_RATE_GATE);
+        PRCC_KCLK_STORE(clk, 3, 3);
 
         clk = clk_reg_prcc_kclk("p3_sdi2_kclk", "sdmmcclk",
                         clkrst3_base, BIT(4), CLK_SET_RATE_GATE);
+        PRCC_KCLK_STORE(clk, 3, 4);
 
         clk = clk_reg_prcc_kclk("p3_ske_kclk", "rtc32k",
                         clkrst3_base, BIT(5), CLK_SET_RATE_GATE);
+        PRCC_KCLK_STORE(clk, 3, 5);
 
         clk = clk_reg_prcc_kclk("p3_uart2_kclk", "uartclk",
                         clkrst3_base, BIT(6), CLK_SET_RATE_GATE);
+        PRCC_KCLK_STORE(clk, 3, 6);
 
         clk = clk_reg_prcc_kclk("p3_sdi5_kclk", "sdmmcclk",
                         clkrst3_base, BIT(7), CLK_SET_RATE_GATE);
+        PRCC_KCLK_STORE(clk, 3, 7);
 
         /* Periph6 */
         clk = clk_reg_prcc_kclk("p3_rng_kclk", "rngclk",
                         clkrst6_base, BIT(0), CLK_SET_RATE_GATE);
+        PRCC_KCLK_STORE(clk, 6, 0);
 
         for_each_child_of_node(np, child) {
                 static struct clk_onecell_data clk_data;
@@ -516,5 +545,8 @@ void u8500_of_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base,
                 }
                 if (!of_node_cmp(child->name, "prcc-periph-clock"))
                         of_clk_add_provider(child, ux500_twocell_get, prcc_pclk);
+
+                if (!of_node_cmp(child->name, "prcc-kernel-clock"))
+                        of_clk_add_provider(child, ux500_twocell_get, prcc_kclk);
         }
 }