[PATCH 21/33] clk: ux500: Add Device Tree support for the PRCC Kernel clock

[lee.jones@linaro.org (Lee Jones)]

> > This patch enables clocks to be specified from Device Tree via phandles
> > to the "prcc-kernel-clock" node.
> >
> > Cc: Mike Turquette <mturquette@linaro.org>
> > Cc: Ulf Hansson <ulf.hansson@linaro.org>
> > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> 
> Could you please fold this patch into a "common PRCC device tree
> support" patch instead. Thus handling both P and K clocks in the same
> patch.

I'm really not a fan of creating massive patches, so I'd really rather
not.

> That would probaby solve the missmatch of the macro definitions as
> well. Like were did the PRCC_KCLK_STORE come from?

I do see your point though, I will move PRCC_KCLK_STORE() into this
patch.

> > ---
> >  drivers/clk/ux500/u8500_clk.c |   30 ++++++++++++++++++++++++++++++
> >  1 file changed, 30 insertions(+)
> >
> > diff --git a/drivers/clk/ux500/u8500_clk.c b/drivers/clk/ux500/u8500_clk.c
> > index 86de1a7..c3ed09c 100644
> > --- a/drivers/clk/ux500/u8500_clk.c
> > +++ b/drivers/clk/ux500/u8500_clk.c
> > @@ -20,6 +20,7 @@
> >
> >  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]
> > @@ -540,110 +541,136 @@ void u8500_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base,
> >         clk = clk_reg_prcc_kclk("p1_uart0_kclk", "uartclk",
> >                         clkrst1_base, BIT(0), CLK_SET_RATE_GATE);
> >         clk_register_clkdev(clk, NULL, "uart0");
> > +       PRCC_KCLK_STORE(clk, 1, 0);
> >
> >         clk = clk_reg_prcc_kclk("p1_uart1_kclk", "uartclk",
> >                         clkrst1_base, BIT(1), CLK_SET_RATE_GATE);
> >         clk_register_clkdev(clk, NULL, "uart1");
> > +       PRCC_KCLK_STORE(clk, 1, 1);
> >
> >         clk = clk_reg_prcc_kclk("p1_i2c1_kclk", "i2cclk",
> >                         clkrst1_base, BIT(2), CLK_SET_RATE_GATE);
> >         clk_register_clkdev(clk, NULL, "nmk-i2c.1");
> > +       PRCC_KCLK_STORE(clk, 1, 2);
> >
> >         clk = clk_reg_prcc_kclk("p1_msp0_kclk", "msp02clk",
> >                         clkrst1_base, BIT(3), CLK_SET_RATE_GATE);
> >         clk_register_clkdev(clk, NULL, "msp0");
> >         clk_register_clkdev(clk, NULL, "ux500-msp-i2s.0");
> > +       PRCC_KCLK_STORE(clk, 1, 3);
> >
> >         clk = clk_reg_prcc_kclk("p1_msp1_kclk", "msp1clk",
> >                         clkrst1_base, BIT(4), CLK_SET_RATE_GATE);
> >         clk_register_clkdev(clk, NULL, "msp1");
> >         clk_register_clkdev(clk, NULL, "ux500-msp-i2s.1");
> > +       PRCC_KCLK_STORE(clk, 1, 4);
> >
> >         clk = clk_reg_prcc_kclk("p1_sdi0_kclk", "sdmmcclk",
> >                         clkrst1_base, BIT(5), CLK_SET_RATE_GATE);
> >         clk_register_clkdev(clk, NULL, "sdi0");
> > +       PRCC_KCLK_STORE(clk, 1, 5);
> >
> >         clk = clk_reg_prcc_kclk("p1_i2c2_kclk", "i2cclk",
> >                         clkrst1_base, BIT(6), CLK_SET_RATE_GATE);
> >         clk_register_clkdev(clk, NULL, "nmk-i2c.2");
> > +       PRCC_KCLK_STORE(clk, 1, 6);
> >
> >         clk = clk_reg_prcc_kclk("p1_slimbus0_kclk", "slimclk",
> >                         clkrst1_base, BIT(8), CLK_SET_RATE_GATE);
> >         clk_register_clkdev(clk, NULL, "slimbus0");
> > +       PRCC_KCLK_STORE(clk, 1, 8);
> >
> >         clk = clk_reg_prcc_kclk("p1_i2c4_kclk", "i2cclk",
> >                         clkrst1_base, BIT(9), CLK_SET_RATE_GATE);
> >         clk_register_clkdev(clk, NULL, "nmk-i2c.4");
> > +       PRCC_KCLK_STORE(clk, 1, 9);
> >
> >         clk = clk_reg_prcc_kclk("p1_msp3_kclk", "msp1clk",
> >                         clkrst1_base, BIT(10), CLK_SET_RATE_GATE);
> >         clk_register_clkdev(clk, NULL, "msp3");
> >         clk_register_clkdev(clk, NULL, "ux500-msp-i2s.3");
> > +       PRCC_KCLK_STORE(clk, 1, 10);
> >
> >         /* Periph2 */
> >         clk = clk_reg_prcc_kclk("p2_i2c3_kclk", "i2cclk",
> >                         clkrst2_base, BIT(0), CLK_SET_RATE_GATE);
> >         clk_register_clkdev(clk, NULL, "nmk-i2c.3");
> > +       PRCC_KCLK_STORE(clk, 2, 0);
> >
> >         clk = clk_reg_prcc_kclk("p2_sdi4_kclk", "sdmmcclk",
> >                         clkrst2_base, BIT(2), CLK_SET_RATE_GATE);
> >         clk_register_clkdev(clk, NULL, "sdi4");
> > +       PRCC_KCLK_STORE(clk, 2, 2);
> >
> >         clk = clk_reg_prcc_kclk("p2_msp2_kclk", "msp02clk",
> >                         clkrst2_base, BIT(3), CLK_SET_RATE_GATE);
> >         clk_register_clkdev(clk, NULL, "msp2");
> >         clk_register_clkdev(clk, NULL, "ux500-msp-i2s.2");
> > +       PRCC_KCLK_STORE(clk, 2, 3);
> >
> >         clk = clk_reg_prcc_kclk("p2_sdi1_kclk", "sdmmcclk",
> >                         clkrst2_base, BIT(4), CLK_SET_RATE_GATE);
> >         clk_register_clkdev(clk, NULL, "sdi1");
> > +       PRCC_KCLK_STORE(clk, 2, 4);
> >
> >         clk = clk_reg_prcc_kclk("p2_sdi3_kclk", "sdmmcclk",
> >                         clkrst2_base, BIT(5), CLK_SET_RATE_GATE);
> >         clk_register_clkdev(clk, NULL, "sdi3");
> > +       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);
> >         clk_register_clkdev(clk, NULL, "ssp0");
> > +       PRCC_KCLK_STORE(clk, 3, 1);
> >
> >         clk = clk_reg_prcc_kclk("p3_ssp1_kclk", "sspclk",
> >                         clkrst3_base, BIT(2), CLK_SET_RATE_GATE);
> >         clk_register_clkdev(clk, NULL, "ssp1");
> > +       PRCC_KCLK_STORE(clk, 3, 2);
> >
> >         clk = clk_reg_prcc_kclk("p3_i2c0_kclk", "i2cclk",
> >                         clkrst3_base, BIT(3), CLK_SET_RATE_GATE);
> >         clk_register_clkdev(clk, NULL, "nmk-i2c.0");
> > +       PRCC_KCLK_STORE(clk, 3, 3);
> >
> >         clk = clk_reg_prcc_kclk("p3_sdi2_kclk", "sdmmcclk",
> >                         clkrst3_base, BIT(4), CLK_SET_RATE_GATE);
> >         clk_register_clkdev(clk, NULL, "sdi2");
> > +       PRCC_KCLK_STORE(clk, 3, 4);
> >
> >         clk = clk_reg_prcc_kclk("p3_ske_kclk", "rtc32k",
> >                         clkrst3_base, BIT(5), CLK_SET_RATE_GATE);
> >         clk_register_clkdev(clk, NULL, "ske");
> >         clk_register_clkdev(clk, NULL, "nmk-ske-keypad");
> > +       PRCC_KCLK_STORE(clk, 3, 5);
> >
> >         clk = clk_reg_prcc_kclk("p3_uart2_kclk", "uartclk",
> >                         clkrst3_base, BIT(6), CLK_SET_RATE_GATE);
> >         clk_register_clkdev(clk, NULL, "uart2");
> > +       PRCC_KCLK_STORE(clk, 3, 6);
> >
> >         clk = clk_reg_prcc_kclk("p3_sdi5_kclk", "sdmmcclk",
> >                         clkrst3_base, BIT(7), CLK_SET_RATE_GATE);
> >         clk_register_clkdev(clk, NULL, "sdi5");
> > +       PRCC_KCLK_STORE(clk, 3, 7);
> >
> >         /* Periph6 */
> >         clk = clk_reg_prcc_kclk("p3_rng_kclk", "rngclk",
> >                         clkrst6_base, BIT(0), CLK_SET_RATE_GATE);
> >         clk_register_clkdev(clk, NULL, "rng");
> > +       PRCC_KCLK_STORE(clk, 6, 0);
> >
> >         if (of_have_populated_dt())
> >                 np = of_find_matching_node(NULL, u8500_clk_of_match);
> > @@ -660,5 +687,8 @@ void u8500_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);
> >         }
> >  }
> >

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog