From patchwork Fri Apr 25 02:05:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chanho Park X-Patchwork-Id: 4057401 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 952549F1F4 for ; Fri, 25 Apr 2014 02:06:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BA06520382 for ; Fri, 25 Apr 2014 02:06:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CCE5A20320 for ; Fri, 25 Apr 2014 02:06:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751434AbaDYCGN (ORCPT ); Thu, 24 Apr 2014 22:06:13 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:21354 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751125AbaDYCGL (ORCPT ); Thu, 24 Apr 2014 22:06:11 -0400 Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N4K001EADU9VS60@mailout4.samsung.com> for linux-samsung-soc@vger.kernel.org; Fri, 25 Apr 2014 11:06:09 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.114]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id 38.0B.11120.E03C9535; Fri, 25 Apr 2014 11:06:06 +0900 (KST) X-AuditID: cbfee68f-b7eff6d000002b70-48-5359c30e0f5d Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id B1.19.25708.E03C9535; Fri, 25 Apr 2014 11:06:06 +0900 (KST) Received: from localhost.localdomain ([10.252.81.149]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N4K00EODDU2TC00@mmp2.samsung.com>; Fri, 25 Apr 2014 11:06:06 +0900 (KST) From: Chanho Park To: kgene.kim@samsung.com, linux-samsung-soc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Chanho Park , Chanwoo Choi , Tomasz Figa Subject: [PATCHv2] ARM: dts: exynos4: clean up arm-pmu node Date: Fri, 25 Apr 2014 11:05:53 +0900 Message-id: <1398391553-4797-1-git-send-email-chanho61.park@samsung.com> X-Mailer: git-send-email 1.8.3.2 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrLLMWRmVeSWpSXmKPExsWyRsSkSJfvcGSwwdsTmhaX92tbXP/ynNWi d8FVNotNj6+xWsw4v4/JYv2M1ywObB6bl9R79G1ZxejxeZNcAHMUl01Kak5mWWqRvl0CV8aL 1dEF50QqNl9rY21gbBDsYuTkkBAwkdj55TsThC0mceHeerYuRi4OIYGljBJb7s1ihSk6vucc K0RiOqPEmlVLGUESQgJtTBK7DiaA2GwCuhJbnr8Ci4sI2Eg0XTjLBNLALDCXUWLtwd3MIAlh AWuJCzcusoDYLAKqEhM2bWcHsXkFPCR+HH7KDLFNQWLZl7XMIM0SAu/ZJBb0PGWDaBCQ+Db5 EFAzB1BCVmLTAah6SYmDK26wTGAUXMDIsIpRNLUguaA4Kb3IWK84Mbe4NC9dLzk/dxMjMChP /3vWv4Px7gHrQ4zJQOMmMkuJJucDgzqvJN7Q2MzIwtTE1NjI3NKMNGElcd77D5OChATSE0tS s1NTC1KL4otKc1KLDzEycXBKNTD6LrW6c7+8at6foCdbzFiLdb/3rvp+W8WpZaXxo3sH2Uvk 7N6kLvspFL+oIP94r4xKVV93mMW5uQZeL8o2nGqNzzts8TuzKCI9k1O6t/3sCyWlaSHVtWf/ xLmoXPP3nnmXJc5/3W32Oam/Khdo7Q3QiHzdKH7ePvfSThfJ+OU6TLbrXR5fiVRiKc5INNRi LipOBACeqSJ2YAIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrFIsWRmVeSWpSXmKPExsVy+t9jQV2+w5HBBm9nKFlc3q9tcf3Lc1aL 3gVX2Sw2Pb7GajHj/D4mi/UzXrM4sHlsXlLv0bdlFaPH501yAcxRDYw2GamJKalFCql5yfkp mXnptkrewfHO8aZmBoa6hpYW5koKeYm5qbZKLj4Bum6ZOUBrlRTKEnNKgUIBicXFSvp2mCaE hrjpWsA0Ruj6hgTB9RgZoIGENYwZL1ZHF5wTqdh8rY21gbFBsIuRk0NCwETi+J5zrBC2mMSF e+vZuhi5OIQEpjNKrFm1lBEkISTQxiSx62ACiM0moCux5fkrsLiIgI1E04WzTCANzAJzGSXW HtzNDJIQFrCWuHDjIguIzSKgKjFh03Z2EJtXwEPix+GnzBDbFCSWfVnLPIGRewEjwypG0dSC 5ILipPRcI73ixNzi0rx0veT83E2M4JB/Jr2DcVWDxSFGAQ5GJR7eCbKRwUKsiWXFlbmHGCU4 mJVEeJVXAYV4UxIrq1KL8uOLSnNSiw8xJgNtn8gsJZqcD4zHvJJ4Q2MTMyNLI3NDCyNjc9KE lcR5D7ZaBwoJpCeWpGanphakFsFsYeLglGpgrPbbyCjYse9Pps6UC0Ir+DYbLLDcMHPejMvR zic6F3PcOVwe4haYt28m/5y4PKcP2zimZ56Y+mHuJE5jqbn8zv0MniazambNeN1/evNGw+Vl u3+l1G85PnXtTP0Xhzafn/6VIaT0rN6b26ckFK/3n3j8zOnF0s3rgkISv9zRduPJnMHTNC31 b58SS3FGoqEWc1FxIgAxwsJIvQIAAA== 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=-7.5 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 This patch cleans a arm-pmu node up for exynos4. Only exynos4412 series boards have four pmu interrupts. Rest of exynos4 boards, except 4412, have only two pmu interrupts. Thus, we can define two interrupts in the exynos4.dtsi and extends the interrupts only exynos4412.dtsi. Cc: Chanwoo Choi Cc: Tomasz Figa Signed-off-by: Chanho Park Tested-by: Tushar Behera --- Changes from v1: - Remove duplicated properties in exynos4412.dtsi(Comment from Tomasz Figa) arch/arm/boot/dts/exynos4.dtsi | 6 ++++++ arch/arm/boot/dts/exynos4210.dtsi | 6 ------ arch/arm/boot/dts/exynos4412.dtsi | 4 ++++ arch/arm/boot/dts/exynos4x12.dtsi | 6 ------ 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi index 0401f4d..b43dc24 100644 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi @@ -105,6 +105,12 @@ reg = <0x10440000 0x1000>; }; + pmu { + compatible = "arm,cortex-a9-pmu"; + interrupt-parent = <&combiner>; + interrupts = <2 2>, <3 2>; + }; + sys_reg: syscon@10010000 { compatible = "samsung,exynos4-sysreg", "syscon"; reg = <0x10010000 0x400>; diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi index cb0e768d..e19c154 100644 --- a/arch/arm/boot/dts/exynos4210.dtsi +++ b/arch/arm/boot/dts/exynos4210.dtsi @@ -75,12 +75,6 @@ #clock-cells = <1>; }; - pmu { - compatible = "arm,cortex-a9-pmu"; - interrupt-parent = <&combiner>; - interrupts = <2 2>, <3 2>; - }; - pinctrl_0: pinctrl@11400000 { compatible = "samsung,exynos4210-pinctrl"; reg = <0x11400000 0x1000>; diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi index a40b6e2..7b75762 100644 --- a/arch/arm/boot/dts/exynos4412.dtsi +++ b/arch/arm/boot/dts/exynos4412.dtsi @@ -26,6 +26,10 @@ samsung,combiner-nr = <20>; }; + pmu { + interrupts = <2 2>, <3 2>, <18 2>, <19 2>; + }; + gic: interrupt-controller@10490000 { cpu-offset = <0x4000>; }; diff --git a/arch/arm/boot/dts/exynos4x12.dtsi b/arch/arm/boot/dts/exynos4x12.dtsi index c4a9306..b730a74 100644 --- a/arch/arm/boot/dts/exynos4x12.dtsi +++ b/arch/arm/boot/dts/exynos4x12.dtsi @@ -31,12 +31,6 @@ mshc0 = &mshc_0; }; - pmu { - compatible = "arm,cortex-a9-pmu"; - interrupt-parent = <&combiner>; - interrupts = <2 2>, <3 2>, <18 2>, <19 2>; - }; - pd_isp: isp-power-domain@10023CA0 { compatible = "samsung,exynos4210-pd"; reg = <0x10023CA0 0x20>;