From patchwork Thu Jun 20 13:13:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rahul Sharma X-Patchwork-Id: 2755671 Return-Path: X-Original-To: patchwork-linux-samsung-soc@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 C74C1C0AB1 for ; Thu, 20 Jun 2013 12:53:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 13AFC204FE for ; Thu, 20 Jun 2013 12:53:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A9AE2204FB for ; Thu, 20 Jun 2013 12:53:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757866Ab3FTMxv (ORCPT ); Thu, 20 Jun 2013 08:53:51 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:61524 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757686Ab3FTMxu (ORCPT ); Thu, 20 Jun 2013 08:53:50 -0400 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MOO006UFZTN2TI0@mailout1.samsung.com> for linux-samsung-soc@vger.kernel.org; Thu, 20 Jun 2013 21:53:49 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.126]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id DE.D7.29708.C5BF2C15; Thu, 20 Jun 2013 21:53:48 +0900 (KST) X-AuditID: cbfee690-b7f6f6d00000740c-c9-51c2fb5c7271 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 4F.F6.21068.C5BF2C15; Thu, 20 Jun 2013 21:53:48 +0900 (KST) Received: from chromeserver-PowerEdge-T410.sisodomain.com ([107.108.73.106]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MOO00CPFZNJ7Y80@mmp1.samsung.com>; Thu, 20 Jun 2013 21:53:48 +0900 (KST) From: Rahul Sharma To: linux-samsung-soc@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, dri-devel@lists.freedesktop.org Cc: kgene.kim@samsung.com, sw0312.kim@samsung.com, inki.dae@samsung.com, seanpaul@chromium.org, l.stach@pengutronix.de, tomasz.figa@gmail.com, rob.herring@calxeda.com, s.nawrocki@samsung.com, grant.likely@linaro.org, joshi@samsung.com, r.sh.open@gmail.com, Rahul Sharma Subject: [PATCH v2 3/8] ARM: dts: exynos5250: move common hdmi properties to exynos5 dtsi Date: Thu, 20 Jun 2013 18:43:49 +0530 Message-id: <1371734034-21296-4-git-send-email-rahul.sharma@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-reply-to: <1371734034-21296-1-git-send-email-rahul.sharma@samsung.com> References: <1371734034-21296-1-git-send-email-rahul.sharma@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsWyRsSkTjfm96FAg6n/rS0OzH7IanHl63s2 iwN/djBaTLo/gcXi+64v7Ba9C66yWTyYe5PJYsb5fUwWC1/EW0xZdJjV4vCKA0wWh9+0s1rc 3XCW0WLG5JdsFqt2/WF04PdY8PkKu8fshossHjtn3WX3uHNtD5vH/e7jTB7nZyxk9Oj/a+DR t2UVo8fnTXIBnFFcNimpOZllqUX6dglcGedPtjIXTJar2LRqAVMD4zyJLkZODgkBE4nte56y QNhiEhfurWfrYuTiEBJYyiix8vAKFpiiLx/nQyUWMUq0rl3ICuHMZpJYN+8hK0gVm4CuxOyD zxhBbBGBXImGv+0sIEXMAuuYJJ53zgUrEhaIltjS0sYMYrMIqEpMnPwfLM4r4CHxegFEjYSA okT3swlsIDangKfE1W1dYGcIAdVMePeOEWSohMBXdonzkw6xQgwSkPg2+RBQEQdQQlZi0wFm iDmSEgdX3GCZwCi8gJFhFaNoakFyQXFSepGJXnFibnFpXrpecn7uJkZgfJ3+92zCDsZ7B6wP MSYDjZvILCWanA+Mz7ySeENjMyMLUxNTYyNzSzPShJXEedVbrAOFBNITS1KzU1MLUovii0pz UosPMTJxcEo1MDov+bRe+IHN3VvlS7wE3KeU/frc8f1RkMKZbC73Xzkl/ZPzbnZv/fMn8fLy d1+eTndy2yC4YhWD7dvSe5m9JXobbDf1Vsz+eTrxSr9v7HdBjcCinKY3z51tfs/o8Dxw697T tMv3vRMWbdkk+lixtXvqldeT+T+8Cf8f21sQKVYyySay6iRLsYMSS3FGoqEWc1FxIgCPPPhP xQIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupnleLIzCtJLcpLzFFi42I5/e+xgG7M70OBBgtvGlgcmP2Q1eLK1/ds Fgf+7GC0mHR/AovF911f2C16F1xls3gw9yaTxYzz+5gsFr6It5iy6DCrxeEVB5gsDr9pZ7W4 u+Eso8WMyS/ZLFbt+sPowO+x4PMVdo/ZDRdZPHbOusvucefaHjaP+93HmTzOz1jI6NH/18Cj b8sqRo/Pm+QCOKMaGG0yUhNTUosUUvOS81My89JtlbyD453jTc0MDHUNLS3MlRTyEnNTbZVc fAJ03TJzgD5QUihLzCkFCgUkFhcr6dthmhAa4qZrAdMYoesbEgTXY2SABhLWMGacP9nKXDBZ rmLTqgVMDYzzJLoYOTkkBEwkvnyczwZhi0lcuLceyObiEBJYxCjRunYhK4Qzm0li3byHrCBV bAK6ErMPPmMEsUUEciUa/razgBQxC6xjknjeOResSFggWmJLSxsziM0ioCoxcfJ/sDivgIfE 6wUQNRICihLdzyaAreYU8JS4uq2LBcQWAqqZ8O4d4wRG3gWMDKsYRVMLkguKk9JzjfSKE3OL S/PS9ZLzczcxgqP3mfQOxlUNFocYBTgYlXh4NS4fDBRiTSwrrsw9xCjBwawkwps651CgEG9K YmVValF+fFFpTmrxIcZkoKsmMkuJJucDE0teSbyhsYm5qbGppYmFiZklacJK4rwHW60DhQTS E0tSs1NTC1KLYLYwcXBKNTC2Zn2vCzVfdzsjIfpc5Jr3y2ql5x2RvZ5qXs5Rd97z3/2n5j+m iy3xPhnhXdr/cdl7DqG/74xbDz7XLrW5aMyTMLeXewrnuhRPG15zN9X0B/9SQ68YJvna8evL 5mfmr/x153uTjr7O05qLtZYdz5a+FuQ92rZPz6emRCOoUnjJVyfr7INnryixFGckGmoxFxUn AgA1Du0/IgMAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 Hdmi Subsystem nodes shares many properties across exynos5 SoCs (exynos5250 and exyno5420). Common code is moved to exynos5.dtsi which is included in exyno5250 and exynos5420 SoC files. It also renames the hdmi and mixer nodes as per dt naming convention in the format name@phy_add. Signed-off-by: Rahul Sharma --- arch/arm/boot/dts/cros5250-common.dtsi | 2 +- arch/arm/boot/dts/exynos5.dtsi | 12 ++++++++++++ arch/arm/boot/dts/exynos5250-arndale.dts | 7 ++++++- arch/arm/boot/dts/exynos5250-smdk5250.dts | 7 ++++++- arch/arm/boot/dts/exynos5250-snow.dts | 8 ++++++++ arch/arm/boot/dts/exynos5250.dtsi | 8 ++------ 6 files changed, 35 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/cros5250-common.dtsi index 3f0239e..abda0b9 100644 --- a/arch/arm/boot/dts/cros5250-common.dtsi +++ b/arch/arm/boot/dts/cros5250-common.dtsi @@ -299,7 +299,7 @@ status = "disabled"; }; - hdmi { + hdmi@14530000 { hpd-gpio = <&gpx3 7 0>; }; diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi index 1ae179e..dcb4943 100644 --- a/arch/arm/boot/dts/exynos5.dtsi +++ b/arch/arm/boot/dts/exynos5.dtsi @@ -144,4 +144,16 @@ #size-cells = <0>; status = "disabled"; }; + + hdmi@14530000 { + reg = <0x14530000 0x70000>; + interrupts = <0 95 0>; + status = "disabled"; + }; + + mixer@14450000 { + reg = <0x14450000 0x10000>; + interrupts = <0 94 0>; + status = "disabled"; + }; }; diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts index 5c7dd6d..c18c346 100644 --- a/arch/arm/boot/dts/exynos5250-arndale.dts +++ b/arch/arm/boot/dts/exynos5250-arndale.dts @@ -423,13 +423,18 @@ }; }; - hdmi { + hdmi@14530000 { + status = "okay"; hpd-gpio = <&gpx3 7 2>; vdd_osc-supply = <&ldo10_reg>; vdd_pll-supply = <&ldo8_reg>; vdd-supply = <&ldo8_reg>; }; + mixer@14450000 { + status = "okay"; + }; + mmc_reg: voltage-regulator { compatible = "regulator-fixed"; regulator-name = "VDD_33ON_2.8V"; diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts index d3da369..c1b8b7f 100644 --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts @@ -221,10 +221,15 @@ status = "disabled"; }; - hdmi { + hdmi@14530000 { + status = "okay"; hpd-gpio = <&gpx3 7 0>; }; + mixer@14450000 { + status = "okay"; + }; + codec@11000000 { samsung,mfc-r = <0x43000000 0x800000>; samsung,mfc-l = <0x51000000 0x800000>; diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts index e79331d..b1378af 100644 --- a/arch/arm/boot/dts/exynos5250-snow.dts +++ b/arch/arm/boot/dts/exynos5250-snow.dts @@ -196,4 +196,12 @@ clock-frequency = <24000000>; }; }; + + hdmi@14530000 { + status = "okay"; + }; + + mixer@14450000 { + status = "okay"; + }; }; diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index baf6f88..0fdbe55 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -578,20 +578,16 @@ clock-names = "gscl"; }; - hdmi { + hdmi@14530000 { compatible = "samsung,exynos5-hdmi"; - reg = <0x14530000 0x70000>; - interrupts = <0 95 0>; clocks = <&clock 333>, <&clock 136>, <&clock 137>, <&clock 333>, <&clock 333>; clock-names = "hdmi", "sclk_hdmi", "sclk_pixel", "sclk_hdmiphy", "hdmiphy"; }; - mixer { + mixer@14450000 { compatible = "samsung,exynos5-mixer"; - reg = <0x14450000 0x10000>; - interrupts = <0 94 0>; }; dp-controller {