From patchwork Thu Mar 13 07:42:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Inki Dae X-Patchwork-Id: 3822301 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9B963BF540 for ; Thu, 13 Mar 2014 07:43:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BD2FE20270 for ; Thu, 13 Mar 2014 07:43:00 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id E50C0201FB for ; Thu, 13 Mar 2014 07:42:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D65B5FAD67; Thu, 13 Mar 2014 00:42:57 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout1.samsung.com (mailout1.samsung.com [203.254.224.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 70381FAD67 for ; Thu, 13 Mar 2014 00:42:55 -0700 (PDT) Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N2D005T66RD56B0@mailout1.samsung.com> for dri-devel@lists.freedesktop.org; Thu, 13 Mar 2014 16:42:49 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.116]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id A4.B4.14803.97161235; Thu, 13 Mar 2014 16:42:49 +0900 (KST) X-AuditID: cbfee691-b7efc6d0000039d3-bb-532161796676 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 8D.62.28157.97161235; Thu, 13 Mar 2014 16:42:49 +0900 (KST) Received: from daeinki-desktop.10.32.193.11 ([10.252.75.62]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N2D00AJ56RCH100@mmp1.samsung.com>; Thu, 13 Mar 2014 16:42:49 +0900 (KST) From: Inki Dae To: airlied@linux.ie, dri-devel@lists.freedesktop.org Subject: [PATCH 2/2] drm/exynos: hdmi: use i2c_adapter instead of i2c_client Date: Thu, 13 Mar 2014 16:42:48 +0900 Message-id: <1394696568-32281-2-git-send-email-inki.dae@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1394696568-32281-1-git-send-email-inki.dae@samsung.com> References: <1394696568-32281-1-git-send-email-inki.dae@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrKLMWRmVeSWpSXmKPExsWyRsSkRLcyUTHYYMtWLYvecyeZLK58fc9m Men+BBaLs01v2C3ubjjL6MDqMbvhIovH9m8PWD3udx9n8ujbsooxgCWKyyYlNSezLLVI3y6B K2Pz+8nMBf8FKhqe1DYwTuLrYuTkkBAwkTg64ScbhC0mceHeeiCbi0NIYCmjxInre9lhihbs uQ1mCwksYpR43pUDUdTNJLG5o5sJJMEmoCoxccV9sEkiAqYSHZOWsoDYzALhEp+mHmAFsYUF fCQOHlkANIiDgwWo/uCpUpAwr4CLxOPlR5hAwhICChJzJtmAhDkFXCVWzbrHArHWReLA7hZm kLUSAu3sEu+XNYKtZREQkPg2+RALRK+sxKYDzBAnS0ocXHGDZQKj8AJGhlWMoqkFyQXFSelF pnrFibnFpXnpesn5uZsYgUF8+t+ziTsY7x+wPsSYDDRuIrOUaHI+MArySuINjc2MLExNTI2N zC3NSBNWEudNf5QUJCSQnliSmp2aWpBaFF9UmpNafIiRiYNTqoHxUukBgcule2a7icc3xvN8 0dWbPp3DrfPj7+luer1vX95RP3noQtr1CCHfjfkfD+754l33c3JNoCfXVKm3l6bnzTnxwDgq uUbW6bff5vTq1E/ac9N333BZdGw+l72E3gNDC3fuTU/e5R/+vGr1So+SCUtncxhdEZnQN+e8 zKIoxl+bH4fIzLEWVmIpzkg01GIuKk4EAFswmJx4AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrEIsWRmVeSWpSXmKPExsVy+t9jAd3KRMVgg1M3VCx6z51ksrjy9T2b xaT7E1gszja9Ybe4u+EsowOrx+yGiywe2789YPW4332cyaNvyyrGAJaoBkabjNTElNQihdS8 5PyUzLx0WyXv4HjneFMzA0NdQ0sLcyWFvMTcVFslF58AXbfMHKDNSgpliTmlQKGAxOJiJX07 TBNCQ9x0LWAaI3R9Q4LgeowM0EDCGsaMze8nMxf8F6hoeFLbwDiJr4uRk0NCwERiwZ7b7BC2 mMSFe+vZQGwhgUWMEs+7croYuYDsbiaJzR3dTCAJNgFViYkr7oMViQiYSnRMWsoCYjMLhEt8 mnqAFcQWFvCROHhkAdBQDg4WoPqDp0pBwrwCLhKPlx9hAglLCChIzJlkAxLmFHCVWDXrHgvE WheJA7tbmCcw8i5gZFjFKJpakFxQnJSea6RXnJhbXJqXrpecn7uJERwjz6R3MK5qsDjEKMDB qMTDu2K5QrAQa2JZcWXuIUYJDmYlEV5PH8VgId6UxMqq1KL8+KLSnNTiQ4zJQDdNZJYSTc4H xm9eSbyhsYmZkaWRuaGFkbE5acJK4rwHW60DhQTSE0tSs1NTC1KLYLYwcXBKNTDOlzi4yKk5 6P0GpfXhbAtFSiakxDw/2xS58YXzxzL7yeHB3xcuttC8+v14wf774k9YH3M2xayaKMEUFsL5 64xdMR/rrvWv176zsTJ1Slt7QkBQu+PA2eB2aS6xFyWX52VM8PMUm/SZ4UnglvLbt5oaTvA3 RPZKOSWtc/n7s/Ly4+IZP/auOfBLiaU4I9FQi7moOBEA1fEhatUCAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: kyungmin.park@samsung.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch changes i2c_client for ddc to i2c_adapter because ddc needs only i2c_adapter. Signed-off-by: Inki Dae Signed-off-by: Kyungmin Park --- drivers/gpu/drm/exynos/exynos_hdmi.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index b695398..a060363 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -184,7 +184,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 */ @@ -765,10 +765,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; @@ -2040,9 +2040,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; } @@ -2092,7 +2092,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; } @@ -2103,7 +2103,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;