openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/exynos: hdmi: use i2c_adapter instead of i2c_client 

This patch changes i2c_client for ddc to i2c_adapter
because ddc needs only i2c_adapter.

Signed-off-by: Inki Dae <inki.dae@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
This commit is contained in:
Inki Dae 2014-03-13 16:38:31 +09:00 committed by Inki Dae
parent bfe4e84c6b
commit 8fa04aae2a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,7 +186,7 @@ struct hdmi_context {
void __iomem *regs; void __iomem *regs;
int irq; int irq;
struct i2c_client *ddc_port; struct i2c_adapter *ddc_adpt;
struct i2c_client *hdmiphy_port; struct i2c_client *hdmiphy_port;
/* current hdmiphy conf regs */ /* current hdmiphy conf regs */
@ -829,10 +829,10 @@ static int hdmi_get_modes(struct drm_connector *connector)
struct hdmi_context *hdata = ctx_from_connector(connector); struct hdmi_context *hdata = ctx_from_connector(connector);
struct edid *edid; struct edid *edid;
if (!hdata->ddc_port) if (!hdata->ddc_adpt)
return -ENODEV; return -ENODEV;
edid = drm_get_edid(connector, hdata->ddc_port->adapter); edid = drm_get_edid(connector, hdata->ddc_adpt);
if (!edid) if (!edid)
return -ENODEV; return -ENODEV;
@ -2106,9 +2106,9 @@ static int hdmi_probe(struct platform_device *pdev)
DRM_ERROR("Failed to find ddc node in device tree\n"); DRM_ERROR("Failed to find ddc node in device tree\n");
return -ENODEV; return -ENODEV;
} }
hdata->ddc_port = of_find_i2c_device_by_node(ddc_node); hdata->ddc_adpt = of_find_i2c_adapter_by_node(ddc_node);
if (!hdata->ddc_port) { if (!hdata->ddc_adpt) {
DRM_ERROR("Failed to get ddc i2c client by node\n"); DRM_ERROR("Failed to get ddc i2c adapter by node\n");
return -ENODEV; return -ENODEV;
} }
@ -2158,7 +2158,7 @@ static int hdmi_probe(struct platform_device *pdev)
err_hdmiphy: err_hdmiphy:
put_device(&hdata->hdmiphy_port->dev); put_device(&hdata->hdmiphy_port->dev);
err_ddc: err_ddc:
put_device(&hdata->ddc_port->dev); put_device(&hdata->ddc_adpt->dev);
return ret; return ret;
} }
@ -2169,7 +2169,7 @@ static int hdmi_remove(struct platform_device *pdev)
struct hdmi_context *hdata = display->ctx; struct hdmi_context *hdata = display->ctx;
put_device(&hdata->hdmiphy_port->dev); put_device(&hdata->hdmiphy_port->dev);
put_device(&hdata->ddc_port->dev); put_device(&hdata->ddc_adpt->dev);
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
return 0; return 0;