From patchwork Mon Jul 8 02:58:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 2824692 Return-Path: X-Original-To: patchwork-linux-arm@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 A5ABCC0AB2 for ; Mon, 8 Jul 2013 02:59:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B8BF220113 for ; Mon, 8 Jul 2013 02:59:26 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AD81320108 for ; Mon, 8 Jul 2013 02:59:25 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uw1fM-0006ks-3k; Mon, 08 Jul 2013 02:59:04 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uw1fB-0007zL-Pd; Mon, 08 Jul 2013 02:58:53 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uw1f8-0007yp-Fw for linux-arm-kernel@lists.infradead.org; Mon, 08 Jul 2013 02:58:51 +0000 Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MPL00LNIK9BRDE0@mailout3.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 08 Jul 2013 11:58:29 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.50]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id 41.9B.08825.5DA2AD15; Mon, 08 Jul 2013 11:58:29 +0900 (KST) X-AuditID: cbfee68e-b7f276d000002279-e6-51da2ad51383 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 65.A8.21068.4DA2AD15; Mon, 08 Jul 2013 11:58:29 +0900 (KST) Received: from DOJG1HAN03 ([12.23.120.99]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MPL00GFKK9GB950@mmp1.samsung.com>; Mon, 08 Jul 2013 11:58:28 +0900 (KST) From: Jingoo Han To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH V5 4/4] video: exynos_dp: Use the generic PHY driver Date: Mon, 08 Jul 2013 11:58:28 +0900 Message-id: <001f01ce7b87$05c6f750$1154e5f0$@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Outlook 14.0 Thread-index: Ac57hwMWHPsi1esqQEOLyNAOV6teng== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmphleLIzCtJLcpLzFFi42I5/e+Zke5VrVuBBttX8lgcvF9v8fKQpsWB 2Q9ZLa6ft7OYdH8Ci8WMpY9YLS4vvMRq0bvgKpvFhac9bBZnm96wW2x6fI3V4kTfB1aLng1b WS1mnN/HZLHu4Qsmi8Nv2lkt1s94zWKxfv4tNgchj52z7rJ7vLpwh8Vj85J6j/MzFjJ69G1Z xehx/MZ2Jo/Pm+QC2KO4bFJSczLLUov07RK4MpouShT8l6k4u/ggSwPjJfEuRg4OCQETicNX croYOYFMMYkL99azdTFycQgJLGOU6Ni1nQUiYSKxe8stdhBbSGARo8Sqo6oQRb8YJT4e6GcE SbAJqEl8+XKYHWSoiIC3xPJriiA1zALXWCR6Xr0HqxEWcJGY+ucEM0gNi4CqxIYb9iBhXgFL iT9z37FD2IISPybfA9vLLKAlsX7ncSYIW15i85q3zBD3KEjsOPsabKSIgJ7EqQNfoOpFJPa9 eMcIsldCYC2HxOKFq8GaWQQEJL5NPsQC8bCsxKYDUHMkJQ6uuMEygVFsFpLVs5CsnoVk9Swk KxYwsqxiFE0tSC4oTkovMtIrTswtLs1L10vOz93ECEkBfTsYbx6wPsSYDLR+IrOUaHI+MIXk lcQbGpsZWZiamBobmVuakSasJM6r1mIdKCSQnliSmp2aWpBaFF9UmpNafIiRiYNTqoGxuNNG 8eGl+4ad5ieDJu9y8/zr6MiZcCJDYZrO6hgGtvLWtn4H8bx93UorMmcySNqxlbw/0bmovMGY yWISN/sN+/QV7Yz3p9zVXTfnsTl/SUfSWjvf82Z//lnOP+R+w7F4t05o/smXSbP2zVR8079U u2QjbwbnpTtt+o+FF/1Ny+ct0ExISlJiKc5INNRiLipOBAAP6tmgFwMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrEKsWRmVeSWpSXmKPExsVy+t9jAd2rWrcCDSauYbM4eL/e4uUhTYsD sx+yWlw/b2cx6f4EFosZSx+xWlxeeInVonfBVTaLC0972CzONr1ht9j0+BqrxYm+D6wWPRu2 slrMOL+PyWLdwxdMFofftLNarJ/xmsVi/fxbbA5CHjtn3WX3eHXhDovH5iX1HudnLGT06Nuy itHj+I3tTB6fN8kFsEc1MNpkpCampBYppOYl56dk5qXbKnkHxzvHm5oZGOoaWlqYKynkJeam 2iq5+AToumXmAD2hpFCWmFMKFApILC5W0rfDNCE0xE3XAqYxQtc3JAiux8gADSSsY8xouihR 8F+m4uzigywNjJfEuxg5OSQETCR2b7nFDmGLSVy4t54NxBYSWMQoseqoahcjF5D9i1Hi44F+ RpAEm4CaxJcvh4EaODhEBLwlll9TBKlhFrjGItHz6j1YjbCAi8TUPyeYQWpYBFQlNtywBwnz ClhK/Jn7jh3CFpT4MfkeC4jNLKAlsX7ncSYIW15i85q3zBD3KEjsOPsabKSIgJ7EqQNfoOpF JPa9eMc4gVFgFpJRs5CMmoVk1CwkLQsYWVYxiqYWJBcUJ6XnGukVJ+YWl+al6yXn525iBKeY Z9I7GFc1WBxiFOBgVOLhlTh9M1CINbGsuDL3EKMEB7OSCK84661AId6UxMqq1KL8+KLSnNTi Q4zJQI9OZJYSTc4Hpr+8knhDYxMzI0sjMwsjE3Nz0oSVxHkPtloHCgmkJ5akZqemFqQWwWxh 4uCUamCcMqVedU/kySCBO/0G2lvfajxoyfbt/NmUcCy8gmub3/znk6MWn97Xovh19rY9EwJq grx7PoXbeTBsYPZ7eVnG/oXgzt0bi5ZPuVtQEvX/Rvzbgrtb3Jnfdy4QNei5e4FnkWXFidA3 i4XYr17naJsycf15tfaEHx/b27IvbzyYvl5UcunmLL4EJZbijERDLeai4kQAv8FyEXUDAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130707_225850_974608_CD40C2E5 X-CRM114-Status: GOOD ( 13.91 ) X-Spam-Score: -6.7 (------) Cc: linux-fbdev@vger.kernel.org, 'Kukjin Kim' , 'Hui Wang' , 'Tomasz Figa' , Jingoo Han , 'Donghwa Lee' , 'Felipe Balbi' , 'Kishon Vijay Abraham I' , 'Inki Dae' , 'Kyungmin Park' , 'Tomi Valkeinen' , 'Sylwester Nawrocki' , 'Jean-Christophe PLAGNIOL-VILLARD' , devicetree-discuss@lists.ozlabs.org, linux-media@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 Use the generic PHY API to control the DP PHY. Signed-off-by: Jingoo Han Reviewed-by: Tomasz Figa --- .../devicetree/bindings/video/exynos_dp.txt | 18 +++++++++--------- drivers/video/exynos/exynos_dp_core.c | 16 ++++++++++++---- drivers/video/exynos/exynos_dp_core.h | 1 + 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/Documentation/devicetree/bindings/video/exynos_dp.txt b/Documentation/devicetree/bindings/video/exynos_dp.txt index 84f10c1..2f56376 100644 --- a/Documentation/devicetree/bindings/video/exynos_dp.txt +++ b/Documentation/devicetree/bindings/video/exynos_dp.txt @@ -6,10 +6,10 @@ We use two nodes: -dptx-phy node(defined inside dp-controller node) For the DP-PHY initialization, we use the dptx-phy node. -Required properties for dptx-phy: - -reg: +Required properties for dptx-phy: deprecated, use phys and phy-names + -reg: deprecated Base address of DP PHY register. - -samsung,enable-mask: + -samsung,enable-mask: deprecated The bit-mask used to enable/disable DP PHY. For the Panel initialization, we read data from dp-controller node. @@ -25,6 +25,10 @@ Required properties for dp-controller: from common clock binding: handle to dp clock. -clock-names: from common clock binding: Shall be "dp". + -phys: + from general PHY binding: the phandle for the PHY device. + -phy-names: + from general PHY binding: Should be "dp". -interrupt-parent: phandle to Interrupt combiner node. -samsung,color-space: @@ -67,12 +71,8 @@ SOC specific portion: interrupt-parent = <&combiner>; clocks = <&clock 342>; clock-names = "dp"; - - dptx-phy { - reg = <0x10040720>; - samsung,enable-mask = <1>; - }; - + phys = <&dp_phy>; + phy-names = "dp"; }; Board Specific portion: diff --git a/drivers/video/exynos/exynos_dp_core.c b/drivers/video/exynos/exynos_dp_core.c index 05fed7d..5e1a715 100644 --- a/drivers/video/exynos/exynos_dp_core.c +++ b/drivers/video/exynos/exynos_dp_core.c @@ -19,6 +19,7 @@ #include #include #include +#include #include "exynos_dp_core.h" @@ -960,8 +961,11 @@ static int exynos_dp_dt_parse_phydata(struct exynos_dp_device *dp) dp_phy_node = of_find_node_by_name(dp_phy_node, "dptx-phy"); if (!dp_phy_node) { - dev_err(dp->dev, "could not find dptx-phy node\n"); - return -ENODEV; + dp->phy = devm_phy_get(dp->dev, "dp"); + if (IS_ERR(dp->phy)) + return PTR_ERR(dp->phy); + else + return 0; } if (of_property_read_u32(dp_phy_node, "reg", &phy_base)) { @@ -992,7 +996,9 @@ err: static void exynos_dp_phy_init(struct exynos_dp_device *dp) { - if (dp->phy_addr) { + if (dp->phy) { + phy_power_on(dp->phy); + } else if (dp->phy_addr) { u32 reg; reg = __raw_readl(dp->phy_addr); @@ -1003,7 +1009,9 @@ static void exynos_dp_phy_init(struct exynos_dp_device *dp) static void exynos_dp_phy_exit(struct exynos_dp_device *dp) { - if (dp->phy_addr) { + if (dp->phy) { + phy_power_off(dp->phy); + } else if (dp->phy_addr) { u32 reg; reg = __raw_readl(dp->phy_addr); diff --git a/drivers/video/exynos/exynos_dp_core.h b/drivers/video/exynos/exynos_dp_core.h index 56cfec8..607e36d 100644 --- a/drivers/video/exynos/exynos_dp_core.h +++ b/drivers/video/exynos/exynos_dp_core.h @@ -151,6 +151,7 @@ struct exynos_dp_device { struct video_info *video_info; struct link_train link_train; struct work_struct hotplug_work; + struct phy *phy; }; /* exynos_dp_reg.c */