From patchwork Mon Apr 14 13:03:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chanho Park X-Patchwork-Id: 3980681 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 24775BFF02 for ; Mon, 14 Apr 2014 13:06:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4E085201BF for ; Mon, 14 Apr 2014 13:06:42 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 74246201BC for ; Mon, 14 Apr 2014 13:06:41 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WZgXz-00073s-RW; Mon, 14 Apr 2014 13:03:39 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WZgXx-0006yt-DV for linux-arm-kernel@lists.infradead.org; Mon, 14 Apr 2014 13:03:38 +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 <0N40005KDUXFGMA0@mailout3.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 14 Apr 2014 22:03:15 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.115]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id 90.4C.09028.39CDB435; Mon, 14 Apr 2014 22:03:15 +0900 (KST) X-AuditID: cbfee68e-b7f566d000002344-43-534bdc9309fc Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id CA.7B.29263.29CDB435; Mon, 14 Apr 2014 22:03:15 +0900 (KST) Received: from localhost.localdomain ([10.252.81.149]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N4000GH2UXAF900@mmp1.samsung.com>; Mon, 14 Apr 2014 22:03:14 +0900 (KST) From: Chanho Park To: kgene.kim@samsung.com, linux-samsung-soc@vger.kernel.org Subject: [PATCH] ARM: dts: exynos4: clean up arm-pmu node Date: Mon, 14 Apr 2014 22:03:04 +0900 Message-id: <1397480584-16195-1-git-send-email-chanho61.park@samsung.com> X-Mailer: git-send-email 1.8.3.2 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrPLMWRmVeSWpSXmKPExsWyRsSkWHfyHe9ggz93uCwu79e2uP7lOatF 74KrbBabHl9jtZhxfh+TxfoZr1kc2Dw2L6n36NuyitHj8ya5AOYoLpuU1JzMstQifbsErozJ i2cyFUwUqXh8ZA97A+NZgS5GTg4JAROJb53N7BC2mMSFe+vZuhi5OIQEljJKnGpazg5T1Ldq JwtEYhGjxJT7j6GcNiaJ93OXMIJUsQnoSmx5/grMFhGwkWi6cJYJpIhZoJdR4u6zb2CjhAUs Ja6/mwtmswioSvS//8oGYvMKeEpcf7qABWKdgsSyL2uZQZolBF6zSWzdv50RokFA4tvkQ0BF HEAJWYlNB5gh6iUlDq64wTKBUXABI8MqRtHUguSC4qT0IiO94sTc4tK8dL3k/NxNjMDAPP3v Wd8OxpsHrA8xJgONm8gsJZqcDwzsvJJ4Q2MzIwtTE1NjI3NLM9KElcR5Fz1MChISSE8sSc1O TS1ILYovKs1JLT7EyMTBKdXAuGSq/36bKza/5QO+BRRmc1a6vvoqEm11/QfDGbkbBz5fY1WJ vv14p0jnLUe76h158wMTz0bEFE00c/4h7z71ofAOHds330zmiwmF6xQap7MVcxU82/deUeSm Vf6W+/yyGeuPLMy8ZSyS3ey9cV4c03q1/d3KPNondnOezq10SHV3fSxxa8sBJZbijERDLeai 4kQAaEihMWICAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrDIsWRmVeSWpSXmKPExsVy+t9jAd3Jd7yDDR7+ZLS4vF/b4vqX56wW vQuusllsenyN1WLG+X1MFutnvGZxYPPYvKTeo2/LKkaPz5vkApijGhhtMlITU1KLFFLzkvNT MvPSbZW8g+Od403NDAx1DS0tzJUU8hJzU22VXHwCdN0yc4DWKimUJeaUAoUCEouLlfTtME0I DXHTtYBpjND1DQmC6zEyQAMJaxgzJi+eyVQwUaTi8ZE97A2MZwW6GDk5JARMJPpW7WSBsMUk Ltxbz9bFyMUhJLCIUWLK/ccsEE4bk8T7uUsYQarYBHQltjx/BWaLCNhINF04ywRSxCzQyyhx 99k3dpCEsIClxPV3c8FsFgFVif73X9lAbF4BT4nrTxdArVOQWPZlLfMERu4FjAyrGEVTC5IL ipPScw31ihNzi0vz0vWS83M3MYLD/pnUDsaVDRaHGAU4GJV4eDvmeAcLsSaWFVfmHmKU4GBW EuF13QoU4k1JrKxKLcqPLyrNSS0+xJgMtH0is5Rocj4wJvNK4g2NTcyMLI3MDS2MjM1JE1YS 5z3Qah0oJJCeWJKanZpakFoEs4WJg1OqgTFIIf9K1O6Jj8ul8led+3YntmiTqlm+jHmXXd6r MxZ1J4wzP+/ctbDi9aZHaamHZu28eHZ9HofGt2jGdvHoHp2/nrf2rY852DbvbNfvud/emhUt 3HzKRbrn+PdXnRmS13/6L1RfIXTLw+FViHnFbq37+1/9eVTG0/dB9IbqnozZO1sNpQ3mC9cp sRRnJBpqMRcVJwIAKxpFA78CAAA= 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-20140414_060337_587689_82F1CB82 X-CRM114-Status: UNSURE ( 8.61 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -6.0 (------) Cc: Chanwoo Choi , t.figa@samsung.com, Chanho Park , linux-arm-kernel@lists.infradead.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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,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 Signed-off-by: Chanho Park --- arch/arm/boot/dts/exynos4.dtsi | 6 ++++++ arch/arm/boot/dts/exynos4210.dtsi | 6 ------ arch/arm/boot/dts/exynos4412.dtsi | 6 ++++++ arch/arm/boot/dts/exynos4x12.dtsi | 6 ------ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi index e541ecb..6de978c 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 cacf614..4e7610f 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 15d3c0a..e6af870 100644 --- a/arch/arm/boot/dts/exynos4412.dtsi +++ b/arch/arm/boot/dts/exynos4412.dtsi @@ -26,6 +26,12 @@ samsung,combiner-nr = <20>; }; + pmu { + compatible = "arm,cortex-a9-pmu"; + interrupt-parent = <&combiner>; + 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 3d77a40..318f3ac 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>;