Commit f6cb1430 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

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: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarAbhinav 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: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent b964444b

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

+3 −6
Original line number Diff line number Diff line
@@ -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));

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

+0 −3
Original line number Diff line number Diff line
@@ -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;