On Wed, Jul 06, 2022 at 03:26:53PM +0200, Konrad Dybcio wrote:
>
>
> On 5.07.2022 22:28, Christian Marangi wrote:
> > Convert clk-rpm driver to parent_data API and change parent names to cxo
> > and pxo instead of the board variant as pxo_board is an ancient name and
> > pxo should be used instead.
> >
> > Signed-off-by: Christian Marangi <ansuelsmth@xxxxxxxxx>
> > ---
> > drivers/clk/qcom/clk-rpm.c | 24 ++++++++++++++++--------
> > 1 file changed, 16 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/clk/qcom/clk-rpm.c b/drivers/clk/qcom/clk-rpm.c
> > index a18811c38018..d45a8b0fc97c 100644
> > --- a/drivers/clk/qcom/clk-rpm.c
> > +++ b/drivers/clk/qcom/clk-rpm.c
> > @@ -23,6 +23,14 @@
> > #define QCOM_RPM_SCALING_ENABLE_ID 0x2
> > #define QCOM_RPM_XO_MODE_ON 0x2
> >
> > +static const struct clk_parent_data gcc_pxo[] = {
> > + { .fw_name = "pxo", .name = "pxo" },
> The .name lookup should include _board, as the old DTs expect that.
> If I understand correctly though, you need to preserve both pxo and
> pxo_board, as they were separate, not sure though..
>
pxo_board is what comes first... then qcom gcc driver hacks it and
create a factor clk with 1/1 div and provide pxo.
In practice they are the same clk. But yhea I should not change the
name, will resent with .name = pxo_board and be done with it.
> Konrad
> > +};
> > +
> > +static const struct clk_parent_data gcc_cxo[] = {
> > + { .fw_name = "cxo", .name = "cxo" },
> > +};
> > +
> > #define DEFINE_CLK_RPM(_platform, _name, _active, r_id) \
> > static struct clk_rpm _platform##_##_active; \
> > static struct clk_rpm _platform##_##_name = { \
> > @@ -32,8 +40,8 @@
> > .hw.init = &(struct clk_init_data){ \
> > .ops = &clk_rpm_ops, \
> > .name = #_name, \
> > - .parent_names = (const char *[]){ "pxo_board" }, \
> > - .num_parents = 1, \
> > + .parent_data = gcc_pxo, \
> > + .num_parents = ARRAY_SIZE(gcc_pxo), \
> > }, \
> > }; \
> > static struct clk_rpm _platform##_##_active = { \
> > @@ -44,8 +52,8 @@
> > .hw.init = &(struct clk_init_data){ \
> > .ops = &clk_rpm_ops, \
> > .name = #_active, \
> > - .parent_names = (const char *[]){ "pxo_board" }, \
> > - .num_parents = 1, \
> > + .parent_data = gcc_pxo, \
> > + .num_parents = ARRAY_SIZE(gcc_pxo), \
> > }, \
> > }
> >
> > @@ -56,8 +64,8 @@
> > .hw.init = &(struct clk_init_data){ \
> > .ops = &clk_rpm_xo_ops, \
> > .name = #_name, \
> > - .parent_names = (const char *[]){ "cxo_board" }, \
> > - .num_parents = 1, \
> > + .parent_data = gcc_cxo, \
> > + .num_parents = ARRAY_SIZE(gcc_cxo), \
> > }, \
> > }
> >
> > @@ -68,8 +76,8 @@
> > .hw.init = &(struct clk_init_data){ \
> > .ops = &clk_rpm_fixed_ops, \
> > .name = #_name, \
> > - .parent_names = (const char *[]){ "pxo" }, \
> > - .num_parents = 1, \
> > + .parent_data = gcc_pxo, \
> > + .num_parents = ARRAY_SIZE(gcc_pxo), \
> > }, \
> > }
> >
--
Ansuel
