summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/exynos/exynos_hdmi.c
diff options
context:
space:
mode:
authorInki Dae2014-03-13 08:38:31 +0100
committerInki Dae2014-03-23 16:36:38 +0100
commit8fa04aae2aa8bafcfc027856904ebee0060506d0 (patch)
tree8e95a4e5f0a3798536f269a4d2f745efb13ff7ab /drivers/gpu/drm/exynos/exynos_hdmi.c
parentdrm/exynos: hdmi: consider APB PHY (diff)
downloadkernel-qcow2-linux-8fa04aae2aa8bafcfc027856904ebee0060506d0.tar.gz
kernel-qcow2-linux-8fa04aae2aa8bafcfc027856904ebee0060506d0.tar.xz
kernel-qcow2-linux-8fa04aae2aa8bafcfc027856904ebee0060506d0.zip
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>
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos_hdmi.c')
-rw-r--r--drivers/gpu/drm/exynos/exynos_hdmi.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index 81e22aecd572..9a6d652a3ef2 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -186,7 +186,7 @@ struct hdmi_context {
void __iomem *regs;
int irq;
- struct i2c_client *ddc_port;
+ struct i2c_adapter *ddc_adpt;
struct i2c_client *hdmiphy_port;
/* 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 edid *edid;
- if (!hdata->ddc_port)
+ if (!hdata->ddc_adpt)
return -ENODEV;
- edid = drm_get_edid(connector, hdata->ddc_port->adapter);
+ edid = drm_get_edid(connector, hdata->ddc_adpt);
if (!edid)
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");
return -ENODEV;
}
- hdata->ddc_port = of_find_i2c_device_by_node(ddc_node);
- if (!hdata->ddc_port) {
- DRM_ERROR("Failed to get ddc i2c client by node\n");
+ 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 -ENODEV;
}
@@ -2158,7 +2158,7 @@ static int hdmi_probe(struct platform_device *pdev)
err_hdmiphy:
put_device(&hdata->hdmiphy_port->dev);
err_ddc:
- put_device(&hdata->ddc_port->dev);
+ put_device(&hdata->ddc_adpt->dev);
return ret;
}
@@ -2169,7 +2169,7 @@ static int hdmi_remove(struct platform_device *pdev)
struct hdmi_context *hdata = display->ctx;
put_device(&hdata->hdmiphy_port->dev);
- put_device(&hdata->ddc_port->dev);
+ put_device(&hdata->ddc_adpt->dev);
pm_runtime_disable(&pdev->dev);
return 0;