From patchwork Mon Jun 2 00:20:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chanho Park X-Patchwork-Id: 4279291 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 066A0BEEA7 for ; Mon, 2 Jun 2014 00:21:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0902620351 for ; Mon, 2 Jun 2014 00:21:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 789A3201E4 for ; Mon, 2 Jun 2014 00:21:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751879AbaFBAVA (ORCPT ); Sun, 1 Jun 2014 20:21:00 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:9458 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751434AbaFBAU7 (ORCPT ); Sun, 1 Jun 2014 20:20:59 -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 <0N6I000ZAMAYP610@mailout1.samsung.com> for linux-samsung-soc@vger.kernel.org; Mon, 02 Jun 2014 09:20:58 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.115]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id 88.D6.13369.963CB835; Mon, 02 Jun 2014 09:20:57 +0900 (KST) X-AuditID: cbfee690-b7fb56d000003439-72-538bc36944cf Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 1F.CB.07139.963CB835; Mon, 02 Jun 2014 09:20:57 +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 <0N6I00FLKMAUVA60@mmp1.samsung.com>; Mon, 02 Jun 2014 09:20:57 +0900 (KST) From: Chanho Park To: kgene.kim@samsung.com, linux-samsung-soc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, tushar.behera@linaro.org, Chanho Park , Chanwoo Choi , Tomasz Figa Subject: [PATCHv3] ARM: dts: exynos4: clean up arm-pmu node Date: Mon, 02 Jun 2014 09:20:45 +0900 Message-id: <1401668445-9810-1-git-send-email-chanho61.park@samsung.com> X-Mailer: git-send-email 1.8.3.2 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrJLMWRmVeSWpSXmKPExsWyRsSkWDfzcHewwdwr5haX92tbXP/ynNWi d8FVNotNj6+xWsw4v4/JYv2M1ywW7X/3sjmwe9y5tofNY/OSeo++LasYPT5vkgtgieKySUnN ySxLLdK3S+DK+PtsNmPBPtGK7lObmBsY7wh2MXJySAiYSDy785ENwhaTuHBvPZDNxSEksJRR oq3jPCtM0ZWbF5khEosYJX51XYaqamOS+PLkNDNIFZuArsSW568YQWwRARuJpgtnmUCKmAW2 M0pcaVoHNkpYwFri4M4LYEUsAqoSmxoXgO3mFfCQeLv6ANQ6BYllX9aCrZMQ+M4mMWHCbXaI BgGJb5MPsXQxcgAlZCU2HWCGqJeUOLjiBssERsEFjAyrGEVTC5ILipPSi0z0ihNzi0vz0vWS 83M3MQKD9fS/ZxN2MN47YH2IMRlo3ERmKdHkfGCw55XEGxqbGVmYmpgaG5lbmpEmrCTOq/Yo KUhIID2xJDU7NbUgtSi+qDQntfgQIxMHp1QDY+OGmlT79d6BrTW3Lf6eLlfcP3m++3bRybOX 62zeZ30i7oxwg1kx++oOJYVKpqP7yn7Pm8Wy7evPrIfb9oqubZ28OiLGUW79ixPHb5Tfj7tR JL3zUOrV90acsa9iV9mLXGC2dbnl6bWIS8Cm36+p2f9AcV/mvQUn36+3dXRexVIxQXGz/z6u Z0osxRmJhlrMRcWJAGzO13hsAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrGIsWRmVeSWpSXmKPExsVy+t9jAd3Mw93BBjv/6Fhc3q9tcf3Lc1aL 3gVX2Sw2Pb7GajHj/D4mi/UzXrNYtP/dy+bA7nHn2h42j81L6j36tqxi9Pi8SS6AJaqB0SYj NTEltUghNS85PyUzL91WyTs43jne1MzAUNfQ0sJcSSEvMTfVVsnFJ0DXLTMH6AAlhbLEnFKg UEBicbGSvh2mCaEhbroWMI0Rur4hQXA9RgZoIGENY8bfZ7MZC/aJVnSf2sTcwHhHsIuRk0NC wETiys2LzBC2mMSFe+vZuhi5OIQEFjFK/Oq6DOW0MUl8eXIarIpNQFdiy/NXjCC2iICNRNOF s0wgRcwC2xklrjStYwVJCAtYSxzceQGsiEVAVWJT4wI2EJtXwEPi7eoDrBDrFCSWfVnLPIGR ewEjwypG0dSC5ILipPRcI73ixNzi0rx0veT83E2M4Fh4Jr2DcVWDxSFGAQ5GJR7eC71dwUKs iWXFlbmHGCU4mJVEeM/P6w4W4k1JrKxKLcqPLyrNSS0+xJgMtH0is5Rocj4wTvNK4g2NTcyM LI3MDS2MjM1JE1YS5z3Yah0oJJCeWJKanZpakFoEs4WJg1OqgdE3WPBcq6WS7l67X8yVb2v0 5p9NiOZm1vIulY7aWb3v8szVdT3PEh4z7ZvyztuvYem69V9XSkk7MnbXsu+XsFtkpBwwdWfy lo//8txFfC0+KDY8kL4fIXnksqY+8xRD80X5FzulStQD40LztvmJuhhf27jU7uLHLanbTBJO dYuul5t7PWv6cSWW4oxEQy3mouJEAGxg4T/JAgAA 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 Tested-by: Tushar Behera Signed-off-by: Chanho Park --- Changes from v2: - Rebase the patch on top of the kukjin's v3.16-next/dt-samsung-3 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 b8ece4b..5cb21a7 100644 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi @@ -123,6 +123,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 ee3001f..a4f28e8 100644 --- a/arch/arm/boot/dts/exynos4210.dtsi +++ b/arch/arm/boot/dts/exynos4210.dtsi @@ -93,12 +93,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 c42a3e1..d8bc059e 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 c5a943d..95cdfb9 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>; - }; - sysram@02020000 { compatible = "mmio-sram"; reg = <0x02020000 0x40000>;