Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1caa360e authored by Milo Kim's avatar Milo Kim Committed by Inki Dae
Browse files

gpu: drm: exynos_hdmi: Move DDC logic into single function 



Paring DT properties and getting the I2C adapter in one function.

Signed-off-by: default avatarMilo Kim <woogyom.kim@gmail.com>
Reviewed-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent 28a39654

drivers/gpu/drm/exynos/exynos_hdmi.c

+25 −21
Original line number Diff line number Diff line
@@ -1760,16 +1760,34 @@ static const struct component_ops hdmi_component_ops = { 
	.unbind = hdmi_unbind,

};



static struct device_node *hdmi_legacy_ddc_dt_binding(struct device *dev)

static int hdmi_get_ddc_adapter(struct hdmi_context *hdata)

{

	const char *compatible_str = "samsung,exynos4210-hdmiddc";

	struct device_node *np;

	struct i2c_adapter *adpt;



	np = of_find_compatible_node(NULL, NULL, compatible_str);

	if (np)

		return of_get_next_parent(np);

		np = of_get_next_parent(np);

	else

		np = of_parse_phandle(hdata->dev->of_node, "ddc", 0);



	if (!np) {

		DRM_ERROR("Failed to find ddc node in device tree\n");

		return -ENODEV;

	}



	adpt = of_find_i2c_adapter_by_node(np);

	of_node_put(np);



	return NULL;

	if (!adpt) {

		DRM_INFO("Failed to get ddc i2c adapter by node\n");

		return -EPROBE_DEFER;

	}



	hdata->ddc_adpt = adpt;



	return 0;

}



static struct device_node *hdmi_legacy_phy_dt_binding(struct device *dev)
@@ -1781,7 +1799,7 @@ static struct device_node *hdmi_legacy_phy_dt_binding(struct device *dev) 


static int hdmi_probe(struct platform_device *pdev)

{

	struct device_node *ddc_node, *phy_node;

	struct device_node *phy_node;

	struct device *dev = &pdev->dev;

	struct hdmi_context *hdata;

	struct resource *res;
@@ -1811,23 +1829,9 @@ static int hdmi_probe(struct platform_device *pdev) 
		return ret;

	}



	ddc_node = hdmi_legacy_ddc_dt_binding(dev);

	if (ddc_node)

		goto out_get_ddc_adpt;



	ddc_node = of_parse_phandle(dev->of_node, "ddc", 0);

	if (!ddc_node) {

		DRM_ERROR("Failed to find ddc node in device tree\n");

		return -ENODEV;

	}

	of_node_put(dev->of_node);



out_get_ddc_adpt:

	hdata->ddc_adpt = of_find_i2c_adapter_by_node(ddc_node);

	if (!hdata->ddc_adpt) {

		DRM_ERROR("Failed to get ddc i2c adapter by node\n");

		return -EPROBE_DEFER;

	}

	ret = hdmi_get_ddc_adapter(hdata);

	if (ret)

		return ret;



	phy_node = hdmi_legacy_phy_dt_binding(dev);

	if (phy_node)