Skip to content

Commit f6cb143

Browse files
committed
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 <[email protected]> Reviewed-by: Abhinav Kumar <[email protected]> Patchwork: https://patchwork.freedesktop.org/patch/499646/ Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Dmitry Baryshkov <[email protected]>
1 parent b964444 commit f6cb143

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

drivers/gpu/drm/msm/hdmi/hdmi.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -138,22 +138,22 @@ static struct hdmi *msm_hdmi_init(struct platform_device *pdev)
138138
if (ret && ret != -ENODEV)
139139
goto fail;
140140

141-
hdmi->mmio = msm_ioremap(pdev, config->mmio_name);
141+
hdmi->mmio = msm_ioremap(pdev, "core_physical");
142142
if (IS_ERR(hdmi->mmio)) {
143143
ret = PTR_ERR(hdmi->mmio);
144144
goto fail;
145145
}
146146

147147
/* HDCP needs physical address of hdmi register */
148148
res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
149-
config->mmio_name);
149+
"core_physical");
150150
if (!res) {
151151
ret = -EINVAL;
152152
goto fail;
153153
}
154154
hdmi->mmio_phy_addr = res->start;
155155

156-
hdmi->qfprom_mmio = msm_ioremap(pdev, config->qfprom_mmio_name);
156+
hdmi->qfprom_mmio = msm_ioremap(pdev, "qfprom_physical");
157157
if (IS_ERR(hdmi->qfprom_mmio)) {
158158
DRM_DEV_INFO(&pdev->dev, "can't find qfprom resource\n");
159159
hdmi->qfprom_mmio = NULL;
@@ -529,9 +529,6 @@ static int msm_hdmi_bind(struct device *dev, struct device *master, void *data)
529529
return -ENXIO;
530530
}
531531

532-
hdmi_cfg->mmio_name = "core_physical";
533-
hdmi_cfg->qfprom_mmio_name = "qfprom_physical";
534-
535532
dev->platform_data = hdmi_cfg;
536533

537534
hdmi = msm_hdmi_init(to_platform_device(dev));

drivers/gpu/drm/msm/hdmi/hdmi.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,6 @@ struct hdmi {
8686

8787
/* platform config data (ie. from DT, or pdata) */
8888
struct hdmi_platform_config {
89-
const char *mmio_name;
90-
const char *qfprom_mmio_name;
91-
9289
/* regulators that need to be on for hpd: */
9390
const char **hpd_reg_names;
9491
int hpd_reg_cnt;

0 commit comments

Comments
 (0)