From patchwork Thu Jul 25 07:34:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rahul Sharma X-Patchwork-Id: 2833239 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 08C3F9F243 for ; Thu, 25 Jul 2013 07:12:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 15AD020209 for ; Thu, 25 Jul 2013 07:12:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 28E9220208 for ; Thu, 25 Jul 2013 07:12:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753232Ab3GYHMF (ORCPT ); Thu, 25 Jul 2013 03:12:05 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:27304 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753096Ab3GYHME (ORCPT ); Thu, 25 Jul 2013 03:12:04 -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 <0MQH003SQDBFMZK0@mailout1.samsung.com> for linux-samsung-soc@vger.kernel.org; Thu, 25 Jul 2013 16:12:03 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.123]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id 88.A3.29708.3CFC0F15; Thu, 25 Jul 2013 16:12:03 +0900 (KST) X-AuditID: cbfee690-b7f6f6d00000740c-17-51f0cfc3e1f5 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id E3.29.31505.3CFC0F15; Thu, 25 Jul 2013 16:12:03 +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 <0MQH009Z5DBL6H90@mmp1.samsung.com>; Thu, 25 Jul 2013 16:12:03 +0900 (KST) From: Rahul Sharma To: linux-samsung-soc@vger.kernel.org, devicetree-discuss@lists.ozlabs.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 v3 5/9] ARM: dts: exynos5250: move common hdmi properties to exynos5 dtsi Date: Thu, 25 Jul 2013 13:04:33 +0530 Message-id: <1374737677-3215-6-git-send-email-rahul.sharma@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-reply-to: <1374737677-3215-1-git-send-email-rahul.sharma@samsung.com> References: <1374737677-3215-1-git-send-email-rahul.sharma@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrGIsWRmVeSWpSXmKPExsWyRsSkWvfw+Q+BBlMuy1ocmP2Q1eLAnx2M FpPuT2Cx+L7rC7tF74KrbBYP5t5ksphxfh+TxcIX8RZTFh1mtTi84gCTxeE37awWdzecZbSY Mfklm8WqXX8YHfg8Fny+wu4xu+Eii8fOWXfZPe5c28PmcX7GQkaP/r8GHn1bVjF6fN4kF8AR xWWTkpqTWZZapG+XwJUxd8pC1oLtchV/gQoaGHdKdDFyckgImEh0/D3MDmGLSVy4t54NxBYS WMoocW+WOkzN29vrGbsYuYDiixglGvd9ZIZwZjNJbLr7HKybTUBXYvbBZ4wgtoiAl0T3mu3s IEXMAuuYJJ53zmXtYuTgEBaIlvj2VQekhkVAVWLGpS4WEJtXwF3i34RFLBDbFCW6n00Au4JT wENi97Nj7BAXuUscObaDFWSmhMBLdonGR7NZIQYJSHybfIgFZL6EgKzEpgPMEHMkJQ6uuMEy gVF4ASPDKkbR1ILkguKk9CITveLE3OLSvHS95PzcTYzAODr979mEHYz3DlgfYkwGGjeRWUo0 OR8Yh3kl8YbGZkYWpiamxkbmlmakCSuJ86q3WAcKCaQnlqRmp6YWpBbFF5XmpBYfYmTi4JRq YOxtntKq5hJ6i8dn2tbVrkHG+/9P3inx3JVXWHKd+p6fhiYV1udUhHJ3eCiEJD2aeMr7TMhh v7dH5ZqSfn/lvfPlZ/mnrOsRpz8XOnP6Hys3cFk3QSHYtlH+62stJkOPNZ438z95/1Obzzpv uYqe3NxnF9v2JV9SWnh30fkZSxk7FJZ5t22WnaPEUpyRaKjFXFScCABwTu/AuQIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmphleLIzCtJLcpLzFFi42I5/e+xgO7h8x8CDVpmClscmP2Q1eLAnx2M FpPuT2Cx+L7rC7tF74KrbBYP5t5ksphxfh+TxcIX8RZTFh1mtTi84gCTxeE37awWdzecZbSY Mfklm8WqXX8YHfg8Fny+wu4xu+Eii8fOWXfZPe5c28PmcX7GQkaP/r8GHn1bVjF6fN4kF8AR 1cBok5GamJJapJCal5yfkpmXbqvkHRzvHG9qZmCoa2hpYa6kkJeYm2qr5OIToOuWmQN0t5JC WWJOKVAoILG4WEnfDtOE0BA3XQuYxghd35AguB4jAzSQsIYxY+6UhawF2+Uq/gId1sC4U6KL kZNDQsBE4u3t9YwQtpjEhXvr2boYuTiEBBYxSjTu+8gM4cxmkth09zk7SBWbgK7E7IPPwDpE BLwkutdsZwcpYhZYxyTxvHMuaxcjB4ewQLTEt686IDUsAqoSMy51sYDYvALuEv8mLGKB2KYo 0f1sAhuIzSngIbH72TGw+UJANUeO7WCdwMi7gJFhFaNoakFyQXFSeq6RXnFibnFpXrpecn7u JkZwnD6T3sG4qsHiEKMAB6MSD++K7+8DhVgTy4orcw8xSnAwK4nwxlZ8CBTiTUmsrEotyo8v Ks1JLT7EmAx01URmKdHkfGAKySuJNzQ2MTc1NrU0sTAxsyRNWEmc92CrdaCQQHpiSWp2ampB ahHMFiYOTqkGRp5HvR4/aucxiX2P5LUz2ae9vPBi76V3K5SZMpKqso5qu9q/VZU3dDqQs70z N7rh5NeNQrP6gqcvbc/sFFirIHz2IZdxm+j8cz/KrJ/y2JRwX45YVng5oTf8rL/o78sR5xKj IhM4lC4sPj/rweWzl+oVXTsf1Yf926G1Rd1nr5XT2Z0Cr6WslFiKMxINtZiLihMBl+96KRcD AAA= 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=-6.9 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 dc259e8b..bef56fa 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 83ab780..955ecfc 100644 --- a/arch/arm/boot/dts/exynos5250-arndale.dts +++ b/arch/arm/boot/dts/exynos5250-arndale.dts @@ -471,13 +471,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"; + }; + regulators { compatible = "simple-bus"; #address-cells = <1>; diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts index 945e6cc..1cce2e8 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 de54b38..f587cd7 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,exynos4212-hdmi"; - reg = <0x14530000 0x70000>; - interrupts = <0 95 0>; clocks = <&clock 344>, <&clock 136>, <&clock 137>, <&clock 159>, <&clock 1024>; clock-names = "hdmi", "sclk_hdmi", "sclk_pixel", "sclk_hdmiphy", "mout_hdmi"; }; - mixer { + mixer@14450000 { compatible = "samsung,exynos5250-mixer"; - reg = <0x14450000 0x10000>; - interrupts = <0 94 0>; clocks = <&clock 343>, <&clock 136>; clock-names = "mixer", "sclk_hdmi"; };