| Message ID | 20190826173120.2971-3-vkoul@kernel.org |
|---|---|
| State | Accepted |
| Commit | a64a9e5172f8551b48883eed2e2c5816180542b0 |
| Headers | show |
| Series | [v5,1/4] dt-bindings: clock: Document the parent clocks | expand |
On Mon 26 Aug 10:31 PDT 2019, Vinod Koul wrote: > Convert the rpmh clock driver to use the new parent data scheme by > specifying the parent data for board clock. > > Signed-off-by: Vinod Koul <vkoul@kernel.org> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> > --- > drivers/clk/qcom/clk-rpmh.c | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c > index c3fd632af119..35d55aee6a01 100644 > --- a/drivers/clk/qcom/clk-rpmh.c > +++ b/drivers/clk/qcom/clk-rpmh.c > @@ -95,7 +95,10 @@ static DEFINE_MUTEX(rpmh_clk_lock); > .hw.init = &(struct clk_init_data){ \ > .ops = &clk_rpmh_ops, \ > .name = #_name, \ > - .parent_names = (const char *[]){ "xo_board" }, \ > + .parent_data = &(const struct clk_parent_data){ \ > + .fw_name = "xo", \ > + .name = "xo_board", \ > + }, \ > .num_parents = 1, \ > }, \ > }; \ > @@ -110,7 +113,10 @@ static DEFINE_MUTEX(rpmh_clk_lock); > .hw.init = &(struct clk_init_data){ \ > .ops = &clk_rpmh_ops, \ > .name = #_name_active, \ > - .parent_names = (const char *[]){ "xo_board" }, \ > + .parent_data = &(const struct clk_parent_data){ \ > + .fw_name = "xo", \ > + .name = "xo_board", \ > + }, \ > .num_parents = 1, \ > }, \ > } > -- > 2.20.1 >
diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c index c3fd632af119..35d55aee6a01 100644 --- a/drivers/clk/qcom/clk-rpmh.c +++ b/drivers/clk/qcom/clk-rpmh.c @@ -95,7 +95,10 @@ static DEFINE_MUTEX(rpmh_clk_lock); .hw.init = &(struct clk_init_data){ \ .ops = &clk_rpmh_ops, \ .name = #_name, \ - .parent_names = (const char *[]){ "xo_board" }, \ + .parent_data = &(const struct clk_parent_data){ \ + .fw_name = "xo", \ + .name = "xo_board", \ + }, \ .num_parents = 1, \ }, \ }; \ @@ -110,7 +113,10 @@ static DEFINE_MUTEX(rpmh_clk_lock); .hw.init = &(struct clk_init_data){ \ .ops = &clk_rpmh_ops, \ .name = #_name_active, \ - .parent_names = (const char *[]){ "xo_board" }, \ + .parent_data = &(const struct clk_parent_data){ \ + .fw_name = "xo", \ + .name = "xo_board", \ + }, \ .num_parents = 1, \ }, \ }
Convert the rpmh clock driver to use the new parent data scheme by specifying the parent data for board clock. Signed-off-by: Vinod Koul <vkoul@kernel.org> --- drivers/clk/qcom/clk-rpmh.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) -- 2.20.1