| Message ID | 20230211115110.1462920-7-konrad.dybcio@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/10] dt-bindings: display/msm: dsi-controller-main: Fix deprecated QCM2290 compatible | expand |
On 11/02/2023 13:51, Konrad Dybcio wrote: > The configs are identical, other than the number of *maximum* DSI > hosts allowed. This isn't an issue, unless somebody deliberately > tries to access the inexistent host by adding a dt node for it. > > Remove the SC7180 struct and point the hw revision match to the > SDM845's one. On a note, this could have been done back when > 7180 support was introduced. > > Fixes: 6125bd327e16 ("drm/msm: add DSI support for sc7180") Same comment regarding Fixes Other than that: Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> > --- > drivers/gpu/drm/msm/dsi/dsi_cfg.c | 15 ++------------- > 1 file changed, 2 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/dsi_cfg.c > index 860681bfc084..142a0f1e2576 100644 > --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c > +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c > @@ -169,7 +169,7 @@ static const struct msm_dsi_config sdm845_dsi_cfg = { > .bus_clk_names = dsi_v2_4_clk_names, > .num_bus_clks = ARRAY_SIZE(dsi_v2_4_clk_names), > .io_start = { > - { 0xae94000, 0xae96000, 0 }, > + { 0xae94000, 0xae96000, 0 }, /* SDM845 / SDM670 / SC7180 */ > }, > }; > > @@ -188,17 +188,6 @@ static const struct msm_dsi_config sm8550_dsi_cfg = { > }, > }; > > -static const struct msm_dsi_config sc7180_dsi_cfg = { > - .io_offset = DSI_6G_REG_SHIFT, > - .regulator_data = dsi_v2_4_regulators, > - .num_regulators = ARRAY_SIZE(dsi_v2_4_regulators), > - .bus_clk_names = dsi_v2_4_clk_names, > - .num_bus_clks = ARRAY_SIZE(dsi_v2_4_clk_names), > - .io_start = { > - { 0xae94000, 0 }, > - }, > -}; > - > static const struct regulator_bulk_data sc7280_dsi_regulators[] = { > { .supply = "vdda", .init_load_uA = 8350 }, /* 1.2 V */ > }; > @@ -299,7 +288,7 @@ static const struct msm_dsi_cfg_handler dsi_cfg_handlers[] = { > {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_4_0, > &sdm845_dsi_cfg, &msm_dsi_6g_v2_host_ops}, > {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_4_1, > - &sc7180_dsi_cfg, &msm_dsi_6g_v2_host_ops}, > + &sdm845_dsi_cfg, &msm_dsi_6g_v2_host_ops}, > {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_5_0, > &sc7280_dsi_cfg, &msm_dsi_6g_v2_host_ops}, > {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_6_0,
On 11.02.2023 16:52, Dmitry Baryshkov wrote: > On 11/02/2023 13:51, Konrad Dybcio wrote: >> The configs are identical, other than the number of *maximum* DSI >> hosts allowed. This isn't an issue, unless somebody deliberately >> tries to access the inexistent host by adding a dt node for it. >> >> Remove the SC7180 struct and point the hw revision match to the >> SDM845's one. On a note, this could have been done back when >> 7180 support was introduced. >> >> Fixes: 6125bd327e16 ("drm/msm: add DSI support for sc7180") > > Same comment regarding Fixes Ack. Konrad > > Other than that: > > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > >> Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> >> --- >> drivers/gpu/drm/msm/dsi/dsi_cfg.c | 15 ++------------- >> 1 file changed, 2 insertions(+), 13 deletions(-) >> >> diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/dsi_cfg.c >> index 860681bfc084..142a0f1e2576 100644 >> --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c >> +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c >> @@ -169,7 +169,7 @@ static const struct msm_dsi_config sdm845_dsi_cfg = { >> .bus_clk_names = dsi_v2_4_clk_names, >> .num_bus_clks = ARRAY_SIZE(dsi_v2_4_clk_names), >> .io_start = { >> - { 0xae94000, 0xae96000, 0 }, >> + { 0xae94000, 0xae96000, 0 }, /* SDM845 / SDM670 / SC7180 */ >> }, >> }; >> @@ -188,17 +188,6 @@ static const struct msm_dsi_config sm8550_dsi_cfg = { >> }, >> }; >> -static const struct msm_dsi_config sc7180_dsi_cfg = { >> - .io_offset = DSI_6G_REG_SHIFT, >> - .regulator_data = dsi_v2_4_regulators, >> - .num_regulators = ARRAY_SIZE(dsi_v2_4_regulators), >> - .bus_clk_names = dsi_v2_4_clk_names, >> - .num_bus_clks = ARRAY_SIZE(dsi_v2_4_clk_names), >> - .io_start = { >> - { 0xae94000, 0 }, >> - }, >> -}; >> - >> static const struct regulator_bulk_data sc7280_dsi_regulators[] = { >> { .supply = "vdda", .init_load_uA = 8350 }, /* 1.2 V */ >> }; >> @@ -299,7 +288,7 @@ static const struct msm_dsi_cfg_handler dsi_cfg_handlers[] = { >> {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_4_0, >> &sdm845_dsi_cfg, &msm_dsi_6g_v2_host_ops}, >> {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_4_1, >> - &sc7180_dsi_cfg, &msm_dsi_6g_v2_host_ops}, >> + &sdm845_dsi_cfg, &msm_dsi_6g_v2_host_ops}, >> {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_5_0, >> &sc7280_dsi_cfg, &msm_dsi_6g_v2_host_ops}, >> {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_6_0, >
diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/dsi_cfg.c index 860681bfc084..142a0f1e2576 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c @@ -169,7 +169,7 @@ static const struct msm_dsi_config sdm845_dsi_cfg = { .bus_clk_names = dsi_v2_4_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_v2_4_clk_names), .io_start = { - { 0xae94000, 0xae96000, 0 }, + { 0xae94000, 0xae96000, 0 }, /* SDM845 / SDM670 / SC7180 */ }, }; @@ -188,17 +188,6 @@ static const struct msm_dsi_config sm8550_dsi_cfg = { }, }; -static const struct msm_dsi_config sc7180_dsi_cfg = { - .io_offset = DSI_6G_REG_SHIFT, - .regulator_data = dsi_v2_4_regulators, - .num_regulators = ARRAY_SIZE(dsi_v2_4_regulators), - .bus_clk_names = dsi_v2_4_clk_names, - .num_bus_clks = ARRAY_SIZE(dsi_v2_4_clk_names), - .io_start = { - { 0xae94000, 0 }, - }, -}; - static const struct regulator_bulk_data sc7280_dsi_regulators[] = { { .supply = "vdda", .init_load_uA = 8350 }, /* 1.2 V */ }; @@ -299,7 +288,7 @@ static const struct msm_dsi_cfg_handler dsi_cfg_handlers[] = { {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_4_0, &sdm845_dsi_cfg, &msm_dsi_6g_v2_host_ops}, {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_4_1, - &sc7180_dsi_cfg, &msm_dsi_6g_v2_host_ops}, + &sdm845_dsi_cfg, &msm_dsi_6g_v2_host_ops}, {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_5_0, &sc7280_dsi_cfg, &msm_dsi_6g_v2_host_ops}, {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_6_0,
The configs are identical, other than the number of *maximum* DSI hosts allowed. This isn't an issue, unless somebody deliberately tries to access the inexistent host by adding a dt node for it. Remove the SC7180 struct and point the hw revision match to the SDM845's one. On a note, this could have been done back when 7180 support was introduced. Fixes: 6125bd327e16 ("drm/msm: add DSI support for sc7180") Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> --- drivers/gpu/drm/msm/dsi/dsi_cfg.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)