| Message ID | 20240717-dispcc-sm8550-fixes-v1-1-efb4d927dc9a@linaro.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | clk: qcom: merge SM8550 and SM8650 display clock controller drivers | expand |
Hi, On 16/07/2024 23:13, Dmitry Baryshkov wrote: > Fix seveal odd-looking places in SM8550's dispcc driver: > > - duplicate entries in disp_cc_parent_map_4 and disp_cc_parent_map_5 > - using &disp_cc_mdss_dptx0_link_div_clk_src as a source for > disp_cc_mdss_dptx1_usb_router_link_intf_clk > > The SM8650 driver has been used as a reference. > > Fixes: 90114ca11476 ("clk: qcom: add SM8550 DISPCC driver") > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > drivers/clk/qcom/dispcc-sm8550.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/clk/qcom/dispcc-sm8550.c b/drivers/clk/qcom/dispcc-sm8550.c > index 31ae46f180a5..09e4b1e40e20 100644 > --- a/drivers/clk/qcom/dispcc-sm8550.c > +++ b/drivers/clk/qcom/dispcc-sm8550.c > @@ -196,7 +196,7 @@ static const struct clk_parent_data disp_cc_parent_data_3[] = { > static const struct parent_map disp_cc_parent_map_4[] = { > { P_BI_TCXO, 0 }, > { P_DP0_PHY_PLL_LINK_CLK, 1 }, > - { P_DP1_PHY_PLL_VCO_DIV_CLK, 2 }, > + { P_DP0_PHY_PLL_VCO_DIV_CLK, 2 }, > { P_DP3_PHY_PLL_VCO_DIV_CLK, 3 }, > { P_DP1_PHY_PLL_VCO_DIV_CLK, 4 }, > { P_DP2_PHY_PLL_VCO_DIV_CLK, 6 }, I checked and it's the right fix. Acked > @@ -213,7 +213,7 @@ static const struct clk_parent_data disp_cc_parent_data_4[] = { > > static const struct parent_map disp_cc_parent_map_5[] = { > { P_BI_TCXO, 0 }, > - { P_DSI0_PHY_PLL_OUT_BYTECLK, 4 }, > + { P_DSI0_PHY_PLL_OUT_BYTECLK, 2 }, > { P_DSI1_PHY_PLL_OUT_BYTECLK, 4 }, > }; Same here, right fix. Acked > > @@ -1146,7 +1146,7 @@ static struct clk_branch disp_cc_mdss_dptx1_usb_router_link_intf_clk = { > .hw.init = &(struct clk_init_data) { > .name = "disp_cc_mdss_dptx1_usb_router_link_intf_clk", > .parent_hws = (const struct clk_hw*[]) { > - &disp_cc_mdss_dptx0_link_div_clk_src.clkr.hw, > + &disp_cc_mdss_dptx1_link_div_clk_src.clkr.hw, > }, > .num_parents = 1, > .flags = CLK_SET_RATE_PARENT, > This one is NAK, I checked and on SM8550 the parent of disp_cc_mdss_dptx1_usb_router_link_intf_clk is really disp_cc_mdss_dptx0_link_div_clk_src I checked on the SM8650 side, and disp_cc_mdss_dptx1_link_div_clk_src is the parent of disp_cc_mdss_dptx1_usb_router_link_intf_clk, so it's different on both platforms. Neil
On Wed, 17 Jul 2024 at 11:08, Neil Armstrong <neil.armstrong@linaro.org> wrote: > > Hi, > > On 16/07/2024 23:13, Dmitry Baryshkov wrote: > > Fix seveal odd-looking places in SM8550's dispcc driver: > > > > - duplicate entries in disp_cc_parent_map_4 and disp_cc_parent_map_5 > > - using &disp_cc_mdss_dptx0_link_div_clk_src as a source for > > disp_cc_mdss_dptx1_usb_router_link_intf_clk > > > > The SM8650 driver has been used as a reference. > > > > Fixes: 90114ca11476 ("clk: qcom: add SM8550 DISPCC driver") > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > > --- > > drivers/clk/qcom/dispcc-sm8550.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > @@ -1146,7 +1146,7 @@ static struct clk_branch disp_cc_mdss_dptx1_usb_router_link_intf_clk = { > > .hw.init = &(struct clk_init_data) { > > .name = "disp_cc_mdss_dptx1_usb_router_link_intf_clk", > > .parent_hws = (const struct clk_hw*[]) { > > - &disp_cc_mdss_dptx0_link_div_clk_src.clkr.hw, > > + &disp_cc_mdss_dptx1_link_div_clk_src.clkr.hw, > > }, > > .num_parents = 1, > > .flags = CLK_SET_RATE_PARENT, > > > > This one is NAK, I checked and on SM8550 the parent of disp_cc_mdss_dptx1_usb_router_link_intf_clk is really disp_cc_mdss_dptx0_link_div_clk_src > > I checked on the SM8650 side, and disp_cc_mdss_dptx1_link_div_clk_src is the parent of disp_cc_mdss_dptx1_usb_router_link_intf_clk, > so it's different on both platforms. Interesting. On sm8450 disp_cc_mdss_dptx1_usb_router_link_intf_clk is also sourced from disp_cc_mdss_dptx0_link_div_clk_src (at least judging from the driver file). I'll drop this chunk and update the clock from the sm8650 branch.
diff --git a/drivers/clk/qcom/dispcc-sm8550.c b/drivers/clk/qcom/dispcc-sm8550.c index 31ae46f180a5..09e4b1e40e20 100644 --- a/drivers/clk/qcom/dispcc-sm8550.c +++ b/drivers/clk/qcom/dispcc-sm8550.c @@ -196,7 +196,7 @@ static const struct clk_parent_data disp_cc_parent_data_3[] = { static const struct parent_map disp_cc_parent_map_4[] = { { P_BI_TCXO, 0 }, { P_DP0_PHY_PLL_LINK_CLK, 1 }, - { P_DP1_PHY_PLL_VCO_DIV_CLK, 2 }, + { P_DP0_PHY_PLL_VCO_DIV_CLK, 2 }, { P_DP3_PHY_PLL_VCO_DIV_CLK, 3 }, { P_DP1_PHY_PLL_VCO_DIV_CLK, 4 }, { P_DP2_PHY_PLL_VCO_DIV_CLK, 6 }, @@ -213,7 +213,7 @@ static const struct clk_parent_data disp_cc_parent_data_4[] = { static const struct parent_map disp_cc_parent_map_5[] = { { P_BI_TCXO, 0 }, - { P_DSI0_PHY_PLL_OUT_BYTECLK, 4 }, + { P_DSI0_PHY_PLL_OUT_BYTECLK, 2 }, { P_DSI1_PHY_PLL_OUT_BYTECLK, 4 }, }; @@ -1146,7 +1146,7 @@ static struct clk_branch disp_cc_mdss_dptx1_usb_router_link_intf_clk = { .hw.init = &(struct clk_init_data) { .name = "disp_cc_mdss_dptx1_usb_router_link_intf_clk", .parent_hws = (const struct clk_hw*[]) { - &disp_cc_mdss_dptx0_link_div_clk_src.clkr.hw, + &disp_cc_mdss_dptx1_link_div_clk_src.clkr.hw, }, .num_parents = 1, .flags = CLK_SET_RATE_PARENT,
Fix seveal odd-looking places in SM8550's dispcc driver: - duplicate entries in disp_cc_parent_map_4 and disp_cc_parent_map_5 - using &disp_cc_mdss_dptx0_link_div_clk_src as a source for disp_cc_mdss_dptx1_usb_router_link_intf_clk The SM8650 driver has been used as a reference. Fixes: 90114ca11476 ("clk: qcom: add SM8550 DISPCC driver") Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- drivers/clk/qcom/dispcc-sm8550.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)