From patchwork Tue Mar 11 07:54:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chanwoo Choi X-Patchwork-Id: 3809191 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 358D0BF540 for ; Tue, 11 Mar 2014 07:57:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 56D3620220 for ; Tue, 11 Mar 2014 07:57:43 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (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 5D51C2021F for ; Tue, 11 Mar 2014 07:57:42 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WNHXt-0006Hj-Aw; Tue, 11 Mar 2014 07:56:17 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WNHXc-0002rj-7J; Tue, 11 Mar 2014 07:56:00 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WNHX8-0002oP-5y for linux-arm-kernel@lists.infradead.org; Tue, 11 Mar 2014 07:55:33 +0000 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 <0N29002FDHZSYP50@mailout1.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 11 Mar 2014 16:55:05 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.116]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id 41.1A.10364.851CE135; Tue, 11 Mar 2014 16:55:04 +0900 (KST) X-AuditID: cbfee690-b7f266d00000287c-53-531ec15876a2 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 99.85.29263.851CE135; Tue, 11 Mar 2014 16:55:04 +0900 (KST) Received: from chan.10.32.193.11 ([10.252.75.48]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N29004OTHZOIV80@mmp1.samsung.com>; Tue, 11 Mar 2014 16:55:04 +0900 (KST) From: Chanwoo Choi To: kgene.kim@samsung.com, t.figa@samsung.com Subject: [PATCH 4/5] ARM: dts: exynos: Move common dt data for interrupt combiner controller Date: Tue, 11 Mar 2014 16:54:53 +0900 Message-id: <1394524494-30641-5-git-send-email-cw00.choi@samsung.com> X-Mailer: git-send-email 1.8.0 In-reply-to: <1394524494-30641-1-git-send-email-cw00.choi@samsung.com> References: <1394524494-30641-1-git-send-email-cw00.choi@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrKIsWRmVeSWpSXmKPExsWyRsSkRDfioFywwfk7VhbXvzxntZh/5Byr xblXKxktehdcZbM42/SG3WLT42usFpd3zWGzmHF+H5PF7cu8FkuvX2SymDB9LYvF4RUHmCxe HWxjsVg/4zWLA5/HmnlrGD1amnvYPBZ8vsLusXL5FzaPzUvqPfq2rGL0+LxJzmPj3NAAjigu m5TUnMyy1CJ9uwSujFl/3rMVrJao+LM4voGxWbiLkYNDQsBEoqPbt4uRE8gUk7hwbz1bFyMX h5DAUkaJRwu2sUEkTCQWnfjDApFYxChxakEXlNPIJNG25icLSBWbgJbE/hc3wDpEBHQlpsy8 wwpSxCxwn0nix/FVYAlhgTiJv3e2soPYLAKqEgsfHQKL8wq4Ssy8PJkFYp2cxIc9j8BqOAXc JJ7eXs4KYgsB1Xx5cpMJZKiEwD12if2/QByQQQIS3yYfYoH4R1Zi0wFmiDmSEgdX3GCZwCi8 gJFhFaNoakFyQXFSepGJXnFibnFpXrpecn7uJkZgFJ3+92zCDsZ7B6wPMSYDjZvILCWanA+M wrySeENjMyMLUxNTYyNzSzPShJXEedUeJQUJCaQnlqRmp6YWpBbFF5XmpBYfYmTi4JRqYHQ4 uPTqy8R3R7x+2n+//ViN3V7y5bndzze4CDJzCTPYHo9XlIsLupG5WZBxFmOlrtyZk2e+atRy 1f4u49zxPfQ4+0exR/P3vqjlUn2x68LUBXyP2m6FL2d6UHyXvewzi3nx6Yiv3nUnNXwL3dN2 9pxW/xSjwW6kfH2S36oUcYe0uUU9ivknjiixFGckGmoxFxUnAgCpQ5+5uAIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpmleLIzCtJLcpLzFFi42I5/e+xgG7EQblggxc9RhbXvzxntZh/5Byr xblXKxktehdcZbM42/SG3WLT42usFpd3zWGzmHF+H5PF7cu8FkuvX2SymDB9LYvF4RUHmCxe HWxjsVg/4zWLA5/HmnlrGD1amnvYPBZ8vsLusXL5FzaPzUvqPfq2rGL0+LxJzmPj3NAAjqgG RpuM1MSU1CKF1Lzk/JTMvHRbJe/geOd4UzMDQ11DSwtzJYW8xNxUWyUXnwBdt8wcoLOVFMoS c0qBQgGJxcVK+naYJoSGuOlawDRG6PqGBMH1GBmggYQ1jBmz/rxnK1gtUfFncXwDY7NwFyMn h4SAicSiE39YIGwxiQv31rN1MXJxCAksYpQ4taCLBcJpZJJoW/MTrIpNQEti/4sbbCC2iICu xJSZd1hBipgF7jNJ/Di+CiwhLBAn8ffOVnYQm0VAVWLho0NgcV4BV4mZlydDrZOT+LDnEVgN p4CbxNPby1lBbCGgmi9PbjJNYORdwMiwilE0tSC5oDgpPddQrzgxt7g0L10vOT93EyM4Sp9J 7WBc2WBxiFGAg1GJhzfAVy5YiDWxrLgy9xCjBAezkgiv01qgEG9KYmVValF+fFFpTmrxIcZk oKsmMkuJJucDE0heSbyhsYmZkaWRuaGFkbE5acJK4rwHWq0DhQTSE0tSs1NTC1KLYLYwcXBK NTDKRj7LPPRzB/9lsRdsDvd6P64sdu43TVZ6s3hTTticbWvXvoxaWunjN+9WQ5pv+ZbIavne PtcFgRunKLv+OFDIymc6Q+XKlo+L9G+f4Pze9zP6w76NjI01B2z8Nz45vHaH7HJJs10CgcKT jq5atXT6rsDHX5h1Ev521Wk4Xfwav8W6vGntP6/lSizFGYmGWsxFxYkAZu4HfBYDAAA= 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-20140311_035530_494445_29B79FF3 X-CRM114-Status: UNSURE ( 7.95 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -6.9 (------) Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux@arm.linux.org.uk, pawel.moll@arm.com, swarren@wwwdotorg.org, ijc+devicetree@hellion.org.uk, linux-kernel@vger.kernel.org, rob.herring@calxeda.com, Chanwoo Choi , kyungmin.park@samsung.com, 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=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 move common dt data of interrupt combiner controller to exynos4x12.dtsi. Each Exynos4x12 SoC has different number of interrput combiner as following: - Exynos4212 : interrput combiner 18(0 ~ 17) - Exynos4412 : interrput combiner 20(0 ~ 19) The exynos combiner driver initialize interrupt according to specific number of interrput combiner. - samsung,combiner-nr : The number of interrput combiners supported. Also, This patch arrange again the dt data according to register address in exynos4212/exynos4412.dtsi. Signed-off-by: Chanwoo Choi Signed-off-by: Kyungmin Park Reviewed-by: Tomasz Figa --- arch/arm/boot/dts/exynos4212.dtsi | 13 ++++--------- arch/arm/boot/dts/exynos4412.dtsi | 14 ++++---------- arch/arm/boot/dts/exynos4x12.dtsi | 8 ++++++++ 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/arch/arm/boot/dts/exynos4212.dtsi b/arch/arm/boot/dts/exynos4212.dtsi index 94a43f9..ceefc71 100644 --- a/arch/arm/boot/dts/exynos4212.dtsi +++ b/arch/arm/boot/dts/exynos4212.dtsi @@ -22,16 +22,11 @@ / { compatible = "samsung,exynos4212"; - gic: interrupt-controller@10490000 { - cpu-offset = <0x8000>; + combiner: interrupt-controller@10440000 { + samsung,combiner-nr = <18>; }; - interrupt-controller@10440000 { - samsung,combiner-nr = <18>; - interrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>, - <0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>, - <0 8 0>, <0 9 0>, <0 10 0>, <0 11 0>, - <0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>, - <0 107 0>, <0 108 0>; + gic: interrupt-controller@10490000 { + cpu-offset = <0x8000>; }; }; diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi index 87b339c..a40b6e2 100644 --- a/arch/arm/boot/dts/exynos4412.dtsi +++ b/arch/arm/boot/dts/exynos4412.dtsi @@ -22,17 +22,11 @@ / { compatible = "samsung,exynos4412"; - gic: interrupt-controller@10490000 { - cpu-offset = <0x4000>; - }; - - interrupt-controller@10440000 { + combiner: interrupt-controller@10440000 { samsung,combiner-nr = <20>; - interrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>, - <0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>, - <0 8 0>, <0 9 0>, <0 10 0>, <0 11 0>, - <0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>, - <0 107 0>, <0 108 0>, <0 48 0>, <0 42 0>; }; + gic: interrupt-controller@10490000 { + cpu-offset = <0x4000>; + }; }; diff --git a/arch/arm/boot/dts/exynos4x12.dtsi b/arch/arm/boot/dts/exynos4x12.dtsi index 066eb35..6e17034 100644 --- a/arch/arm/boot/dts/exynos4x12.dtsi +++ b/arch/arm/boot/dts/exynos4x12.dtsi @@ -73,6 +73,14 @@ }; }; + combiner: interrupt-controller@10440000 { + interrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>, + <0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>, + <0 8 0>, <0 9 0>, <0 10 0>, <0 11 0>, + <0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>, + <0 107 0>, <0 108 0>, <0 48 0>, <0 42 0>; + }; + pinctrl_0: pinctrl@11400000 { compatible = "samsung,exynos4x12-pinctrl"; reg = <0x11400000 0x1000>;