tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
+3
-24
+3
-24
drivers/gpu/drm/msm/hdmi/hdmi.c
+3
-24
drivers/gpu/drm/msm/hdmi/hdmi.c
···
392
392
.hpd_freq = hpd_clk_freq_8x74,
393
393
};
394
394
395
-
static struct hdmi_platform_config hdmi_tx_8084_config = {
396
-
HDMI_CFG(pwr_reg, 8x74),
397
-
HDMI_CFG(pwr_clk, 8x74),
398
-
HDMI_CFG(hpd_clk, 8x74),
399
-
.hpd_freq = hpd_clk_freq_8x74,
400
-
};
401
-
402
-
static struct hdmi_platform_config hdmi_tx_8994_config = {
403
-
HDMI_CFG(pwr_reg, 8x74),
404
-
HDMI_CFG(pwr_clk, 8x74),
405
-
HDMI_CFG(hpd_clk, 8x74),
406
-
.hpd_freq = hpd_clk_freq_8x74,
407
-
};
408
-
409
-
static struct hdmi_platform_config hdmi_tx_8996_config = {
410
-
HDMI_CFG(pwr_reg, 8x74),
411
-
HDMI_CFG(pwr_clk, 8x74),
412
-
HDMI_CFG(hpd_clk, 8x74),
413
-
.hpd_freq = hpd_clk_freq_8x74,
414
-
};
415
-
416
395
/*
417
396
* HDMI audio codec callbacks
418
397
*/
···
562
583
}
563
584
564
585
static const struct of_device_id msm_hdmi_dt_match[] = {
565
-
{ .compatible = "qcom,hdmi-tx-8996", .data = &hdmi_tx_8996_config },
566
-
{ .compatible = "qcom,hdmi-tx-8994", .data = &hdmi_tx_8994_config },
567
-
{ .compatible = "qcom,hdmi-tx-8084", .data = &hdmi_tx_8084_config },
586
+
{ .compatible = "qcom,hdmi-tx-8996", .data = &hdmi_tx_8974_config },
587
+
{ .compatible = "qcom,hdmi-tx-8994", .data = &hdmi_tx_8974_config },
588
+
{ .compatible = "qcom,hdmi-tx-8084", .data = &hdmi_tx_8974_config },
568
589
{ .compatible = "qcom,hdmi-tx-8974", .data = &hdmi_tx_8974_config },
569
590
{ .compatible = "qcom,hdmi-tx-8960", .data = &hdmi_tx_8960_config },
570
591
{ .compatible = "qcom,hdmi-tx-8660", .data = &hdmi_tx_8660_config },