drm/msm/hdmi: merge platform config for 8974/8084/8994/8996

Since there is no more difference between the HDMI platform data
between MSM8974/APQ8084/MSM8994/MSM8996, merge these configs into a
single entry.

Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/488868/
Link: https://lore.kernel.org/r/20220609122350.3157529-11-dmitry.baryshkov@linaro.org
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c
index 48cd6b9..0f1c63f 100644 (file)
--- a/drivers/gpu/drm/msm/hdmi/hdmi.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.c
@@ -392,27 +392,6 @@ static struct hdmi_platform_config hdmi_tx_8974_config = {
                .hpd_freq      = hpd_clk_freq_8x74,
 };
 
-static struct hdmi_platform_config hdmi_tx_8084_config = {
-               HDMI_CFG(pwr_reg, 8x74),
-               HDMI_CFG(pwr_clk, 8x74),
-               HDMI_CFG(hpd_clk, 8x74),
-               .hpd_freq      = hpd_clk_freq_8x74,
-};
-
-static struct hdmi_platform_config hdmi_tx_8994_config = {
-               HDMI_CFG(pwr_reg, 8x74),
-               HDMI_CFG(pwr_clk, 8x74),
-               HDMI_CFG(hpd_clk, 8x74),
-               .hpd_freq      = hpd_clk_freq_8x74,
-};
-
-static struct hdmi_platform_config hdmi_tx_8996_config = {
-               HDMI_CFG(pwr_reg, 8x74),
-               HDMI_CFG(pwr_clk, 8x74),
-               HDMI_CFG(hpd_clk, 8x74),
-               .hpd_freq      = hpd_clk_freq_8x74,
-};
-
 /*
  * HDMI audio codec callbacks
  */
@@ -583,9 +562,9 @@ static int msm_hdmi_dev_remove(struct platform_device *pdev)
 }
 
 static const struct of_device_id msm_hdmi_dt_match[] = {
-       { .compatible = "qcom,hdmi-tx-8996", .data = &hdmi_tx_8996_config },
-       { .compatible = "qcom,hdmi-tx-8994", .data = &hdmi_tx_8994_config },
-       { .compatible = "qcom,hdmi-tx-8084", .data = &hdmi_tx_8084_config },
+       { .compatible = "qcom,hdmi-tx-8996", .data = &hdmi_tx_8974_config },
+       { .compatible = "qcom,hdmi-tx-8994", .data = &hdmi_tx_8974_config },
+       { .compatible = "qcom,hdmi-tx-8084", .data = &hdmi_tx_8974_config },
        { .compatible = "qcom,hdmi-tx-8974", .data = &hdmi_tx_8974_config },
        { .compatible = "qcom,hdmi-tx-8960", .data = &hdmi_tx_8960_config },
        { .compatible = "qcom,hdmi-tx-8660", .data = &hdmi_tx_8660_config },