| Message ID | 20240417105605.836705-3-quic_varada@quicinc.com |
|---|---|
| State | New |
| Headers | show |
| Series | Add interconnect driver for IPQ9574 SoC | expand |
On Wed, 17 Apr 2024 at 13:56, Varadarajan Narayanan <quic_varada@quicinc.com> wrote: > > The icc-clk driver has been changed to take master and slave id > from the caller instead of auto-generating them. Update > clk-cbf-8996 accordingly. This should be squashed into the previous patch. Otherwise the driver is broken between two commits. > > Signed-off-by: Varadarajan Narayanan <quic_varada@quicinc.com> > --- > drivers/clk/qcom/clk-cbf-8996.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/clk/qcom/clk-cbf-8996.c b/drivers/clk/qcom/clk-cbf-8996.c > index fe24b4abeab4..a077d4403967 100644 > --- a/drivers/clk/qcom/clk-cbf-8996.c > +++ b/drivers/clk/qcom/clk-cbf-8996.c > @@ -237,7 +237,12 @@ static int qcom_msm8996_cbf_icc_register(struct platform_device *pdev, struct cl > struct device *dev = &pdev->dev; > struct clk *clk = devm_clk_hw_get_clk(dev, cbf_hw, "cbf"); > const struct icc_clk_data data[] = { > - { .clk = clk, .name = "cbf", }, > + { > + .clk = clk, > + .name = "cbf", > + .master_id = MASTER_CBF_M4M, > + .slave_id = SLAVE_CBF_M4M, > + }, > }; > struct icc_provider *provider; > > -- > 2.34.1 >
diff --git a/drivers/clk/qcom/clk-cbf-8996.c b/drivers/clk/qcom/clk-cbf-8996.c index fe24b4abeab4..a077d4403967 100644 --- a/drivers/clk/qcom/clk-cbf-8996.c +++ b/drivers/clk/qcom/clk-cbf-8996.c @@ -237,7 +237,12 @@ static int qcom_msm8996_cbf_icc_register(struct platform_device *pdev, struct cl struct device *dev = &pdev->dev; struct clk *clk = devm_clk_hw_get_clk(dev, cbf_hw, "cbf"); const struct icc_clk_data data[] = { - { .clk = clk, .name = "cbf", }, + { + .clk = clk, + .name = "cbf", + .master_id = MASTER_CBF_M4M, + .slave_id = SLAVE_CBF_M4M, + }, }; struct icc_provider *provider;
The icc-clk driver has been changed to take master and slave id from the caller instead of auto-generating them. Update clk-cbf-8996 accordingly. Signed-off-by: Varadarajan Narayanan <quic_varada@quicinc.com> --- drivers/clk/qcom/clk-cbf-8996.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)