leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Milo Kim <woogyom.kim@gmail.com>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
This commit is contained in:
Milo Kim 2016-08-31 15:14:25 +09:00 committed by Inki Dae
parent 28a396545a
commit 1caa360ed9
1 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/gpu/drm/exynos/exynos_hdmi.c
View File

@ -1760,16 +1760,34 @@ static const struct component_ops hdmi_component_ops = {
.unbind = hdmi_unbind, .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"; const char *compatible_str = "samsung,exynos4210-hdmiddc";
struct device_node *np; struct device_node *np;
struct i2c_adapter *adpt;
np = of_find_compatible_node(NULL, NULL, compatible_str); np = of_find_compatible_node(NULL, NULL, compatible_str);
if (np) 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);
return NULL; 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);
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) 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) 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 device *dev = &pdev->dev;
struct hdmi_context *hdata; struct hdmi_context *hdata;
struct resource *res; struct resource *res;
@ -1811,23 +1829,9 @@ static int hdmi_probe(struct platform_device *pdev)
return ret; return ret;
} }
ddc_node = hdmi_legacy_ddc_dt_binding(dev); ret = hdmi_get_ddc_adapter(hdata);
if (ddc_node) if (ret)
goto out_get_ddc_adpt; return ret;
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;
}
phy_node = hdmi_legacy_phy_dt_binding(dev); phy_node = hdmi_legacy_phy_dt_binding(dev);
if (phy_node) if (phy_node)