diff options
author | Inki Dae <inki.dae@samsung.com> | 2014-03-13 03:38:31 -0400 |
---|---|---|
committer | Inki Dae <daeinki@gmail.com> | 2014-03-23 11:36:38 -0400 |
commit | 8fa04aae2aa8bafcfc027856904ebee0060506d0 (patch) | |
tree | 8e95a4e5f0a3798536f269a4d2f745efb13ff7ab | |
parent | bfe4e84c6b3f4314dfd17c62ca2d72b5f5a94d3c (diff) |
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>
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_hdmi.c | 16 |
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 { | |||
186 | void __iomem *regs; | 186 | void __iomem *regs; |
187 | int irq; | 187 | int irq; |
188 | 188 | ||
189 | struct i2c_client *ddc_port; | 189 | struct i2c_adapter *ddc_adpt; |
190 | struct i2c_client *hdmiphy_port; | 190 | struct i2c_client *hdmiphy_port; |
191 | 191 | ||
192 | /* current hdmiphy conf regs */ | 192 | /* current hdmiphy conf regs */ |
@@ -829,10 +829,10 @@ static int hdmi_get_modes(struct drm_connector *connector) | |||
829 | struct hdmi_context *hdata = ctx_from_connector(connector); | 829 | struct hdmi_context *hdata = ctx_from_connector(connector); |
830 | struct edid *edid; | 830 | struct edid *edid; |
831 | 831 | ||
832 | if (!hdata->ddc_port) | 832 | if (!hdata->ddc_adpt) |
833 | return -ENODEV; | 833 | return -ENODEV; |
834 | 834 | ||
835 | edid = drm_get_edid(connector, hdata->ddc_port->adapter); | 835 | edid = drm_get_edid(connector, hdata->ddc_adpt); |
836 | if (!edid) | 836 | if (!edid) |
837 | return -ENODEV; | 837 | return -ENODEV; |
838 | 838 | ||
@@ -2106,9 +2106,9 @@ static int hdmi_probe(struct platform_device *pdev) | |||
2106 | DRM_ERROR("Failed to find ddc node in device tree\n"); | 2106 | DRM_ERROR("Failed to find ddc node in device tree\n"); |
2107 | return -ENODEV; | 2107 | return -ENODEV; |
2108 | } | 2108 | } |
2109 | hdata->ddc_port = of_find_i2c_device_by_node(ddc_node); | 2109 | hdata->ddc_adpt = of_find_i2c_adapter_by_node(ddc_node); |
2110 | if (!hdata->ddc_port) { | 2110 | if (!hdata->ddc_adpt) { |
2111 | DRM_ERROR("Failed to get ddc i2c client by node\n"); | 2111 | DRM_ERROR("Failed to get ddc i2c adapter by node\n"); |
2112 | return -ENODEV; | 2112 | return -ENODEV; |
2113 | } | 2113 | } |
2114 | 2114 | ||
@@ -2158,7 +2158,7 @@ static int hdmi_probe(struct platform_device *pdev) | |||
2158 | err_hdmiphy: | 2158 | err_hdmiphy: |
2159 | put_device(&hdata->hdmiphy_port->dev); | 2159 | put_device(&hdata->hdmiphy_port->dev); |
2160 | err_ddc: | 2160 | err_ddc: |
2161 | put_device(&hdata->ddc_port->dev); | 2161 | put_device(&hdata->ddc_adpt->dev); |
2162 | return ret; | 2162 | return ret; |
2163 | } | 2163 | } |
2164 | 2164 | ||
@@ -2169,7 +2169,7 @@ static int hdmi_remove(struct platform_device *pdev) | |||
2169 | struct hdmi_context *hdata = display->ctx; | 2169 | struct hdmi_context *hdata = display->ctx; |
2170 | 2170 | ||
2171 | put_device(&hdata->hdmiphy_port->dev); | 2171 | put_device(&hdata->hdmiphy_port->dev); |
2172 | put_device(&hdata->ddc_port->dev); | 2172 | put_device(&hdata->ddc_adpt->dev); |
2173 | pm_runtime_disable(&pdev->dev); | 2173 | pm_runtime_disable(&pdev->dev); |
2174 | 2174 | ||
2175 | return 0; | 2175 | return 0; |