drm/msm/dsi: dsi_cfg: Merge SC7180 config into SDM845

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.

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org>
Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/527654/
Link: https://lore.kernel.org/r/20230307-topic-dsi_qcm-v6-5-70e13b1214fa@linaro.org
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/dsi_cfg.c
index 039f503..03d98cb 100644 (file)
--- 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 },
+               { 0xae94000, 0xae96000 }, /* 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 },
-       },
-};
-
 static const struct regulator_bulk_data sc7280_dsi_regulators[] = {
        { .supply = "vdda", .init_load_uA = 8350 },     /* 1.2 V */
 };
@@ -291,7 +280,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,