Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/msm/hdmi: drop constant resource names from platform config

All MSM HDMI devices use "core_physical" and "qfprom_physical" names for
register areas. Drop them from the platform config.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/499646/
Link: https://lore.kernel.org/r/20220826093927.851597-3-dmitry.baryshkov@linaro.org
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

+3 -9
+3 -6
drivers/gpu/drm/msm/hdmi/hdmi.c
··· 138 138 if (ret && ret != -ENODEV) 139 139 goto fail; 140 140 141 - hdmi->mmio = msm_ioremap(pdev, config->mmio_name); 141 + hdmi->mmio = msm_ioremap(pdev, "core_physical"); 142 142 if (IS_ERR(hdmi->mmio)) { 143 143 ret = PTR_ERR(hdmi->mmio); 144 144 goto fail; ··· 146 146 147 147 /* HDCP needs physical address of hdmi register */ 148 148 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, 149 - config->mmio_name); 149 + "core_physical"); 150 150 if (!res) { 151 151 ret = -EINVAL; 152 152 goto fail; 153 153 } 154 154 hdmi->mmio_phy_addr = res->start; 155 155 156 - hdmi->qfprom_mmio = msm_ioremap(pdev, config->qfprom_mmio_name); 156 + hdmi->qfprom_mmio = msm_ioremap(pdev, "qfprom_physical"); 157 157 if (IS_ERR(hdmi->qfprom_mmio)) { 158 158 DRM_DEV_INFO(&pdev->dev, "can't find qfprom resource\n"); 159 159 hdmi->qfprom_mmio = NULL; ··· 528 528 DRM_DEV_ERROR(dev, "unknown hdmi_cfg: %pOFn\n", of_node); 529 529 return -ENXIO; 530 530 } 531 - 532 - hdmi_cfg->mmio_name = "core_physical"; 533 - hdmi_cfg->qfprom_mmio_name = "qfprom_physical"; 534 531 535 532 dev->platform_data = hdmi_cfg; 536 533
-3
drivers/gpu/drm/msm/hdmi/hdmi.h
··· 86 86 87 87 /* platform config data (ie. from DT, or pdata) */ 88 88 struct hdmi_platform_config { 89 - const char *mmio_name; 90 - const char *qfprom_mmio_name; 91 - 92 89 /* regulators that need to be on for hpd: */ 93 90 const char **hpd_reg_names; 94 91 int hpd_reg_cnt;