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>

diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c
index 8cd5d50639a539d49e0405920567ec5a6daae3f5..6bb237bd3ab855a7c4775a77ed0b570a59fbcd12 100644 (file)
--- a/drivers/gpu/drm/msm/hdmi/hdmi.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.c
@@ -138,7 +138,7 @@ static struct hdmi *msm_hdmi_init(struct platform_device *pdev)
        if (ret && ret != -ENODEV)
                goto fail;
 
-       hdmi->mmio = msm_ioremap(pdev, config->mmio_name);
+       hdmi->mmio = msm_ioremap(pdev, "core_physical");
        if (IS_ERR(hdmi->mmio)) {
                ret = PTR_ERR(hdmi->mmio);
                goto fail;
@@ -146,14 +146,14 @@ static struct hdmi *msm_hdmi_init(struct platform_device *pdev)
 
        /* HDCP needs physical address of hdmi register */
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
-               config->mmio_name);
+               "core_physical");
        if (!res) {
                ret = -EINVAL;
                goto fail;
        }
        hdmi->mmio_phy_addr = res->start;
 
-       hdmi->qfprom_mmio = msm_ioremap(pdev, config->qfprom_mmio_name);
+       hdmi->qfprom_mmio = msm_ioremap(pdev, "qfprom_physical");
        if (IS_ERR(hdmi->qfprom_mmio)) {
                DRM_DEV_INFO(&pdev->dev, "can't find qfprom resource\n");
                hdmi->qfprom_mmio = NULL;
@@ -529,9 +529,6 @@ static int msm_hdmi_bind(struct device *dev, struct device *master, void *data)
                return -ENXIO;
        }
 
-       hdmi_cfg->mmio_name     = "core_physical";
-       hdmi_cfg->qfprom_mmio_name = "qfprom_physical";
-
        dev->platform_data = hdmi_cfg;
 
        hdmi = msm_hdmi_init(to_platform_device(dev));

diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.h b/drivers/gpu/drm/msm/hdmi/hdmi.h
index 04a74381aaf7c213eec774ba541903d2aee19c6c..e8dbee50637fa5a382d5448d83f7665d11efbae3 100644 (file)
--- a/drivers/gpu/drm/msm/hdmi/hdmi.h
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.h
@@ -86,9 +86,6 @@ struct hdmi {
 
 /* platform config data (ie. from DT, or pdata) */
 struct hdmi_platform_config {
-       const char *mmio_name;
-       const char *qfprom_mmio_name;
-
        /* regulators that need to be on for hpd: */
        const char **hpd_reg_names;
        int hpd_reg_cnt;