From patchwork Tue Aug 20 13:52:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2847100 Return-Path: X-Original-To: patchwork-linux-arm@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 C19E59F271 for ; Tue, 20 Aug 2013 13:55:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1C8B42045E for ; Tue, 20 Aug 2013 13:54:58 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D1A4B20445 for ; Tue, 20 Aug 2013 13:54:56 +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 1VBmO7-0007f7-9v; Tue, 20 Aug 2013 13:54:23 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VBmNq-0004u6-Nw; Tue, 20 Aug 2013 13:54:06 +0000 Received: from mailout2.w1.samsung.com ([210.118.77.12]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VBmNF-0004oK-3W for linux-arm-kernel@lists.infradead.org; Tue, 20 Aug 2013 13:53:33 +0000 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout2.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MRU00BVB18621A0@mailout2.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 20 Aug 2013 14:53:03 +0100 (BST) X-AuditID: cbfec7f5-b7f5f6d00000105f-98-521374bfd6fb Received: from eusync4.samsung.com ( [203.254.199.214]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id 77.81.04191.FB473125; Tue, 20 Aug 2013 14:53:03 +0100 (BST) Received: from amdc1227.digital.local ([106.116.147.199]) by eusync4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MRU00BA81854D30@eusync4.samsung.com>; Tue, 20 Aug 2013 14:53:03 +0100 (BST) From: Tomasz Figa To: linux-samsung-soc@vger.kernel.org Subject: [PATCH 4/8] ARM: dts: exynos4: Simplify MCT interrupt map Date: Tue, 20 Aug 2013 15:52:44 +0200 Message-id: <1377006768-23174-5-git-send-email-t.figa@samsung.com> X-Mailer: git-send-email 1.8.3.2 In-reply-to: <1377006768-23174-1-git-send-email-t.figa@samsung.com> References: <1377006768-23174-1-git-send-email-t.figa@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrPLMWRmVeSWpSXmKPExsVy+t/xa7r7S4SDDLbu5bb4O+kYu8X8I+dY LfrfLGS1eNPbwWLRu+Aqm8XZpjfsFpseX2O1mHF+H5PF0usXmSxOXf/MZjFh+loWi8MrDjBZ HH7Tzmrx6mAbi8X6Ga9ZLI7NWMLoIOCxZt4aRo/fvyYxeiz4fIXd4/XkCYwel/t6mTzuXNvD 5rF5Sb3HlRNNrB59W1YxenzeJOexcW5oAHcUl01Kak5mWWqRvl0CV8alPU9ZC94LVTR1BjQw TuPrYuTkkBAwkVg2ayU7hC0mceHeerYuRi4OIYGljBJb1z1igXD6mCQ2vjrMCFLFJqAm8bnh ERuILSKgKvG5bQE7SBGzwFNmiR275rOAJIQFnCSOze5jBbFZgIruHtjIDGLzAsU3bdjHCrFO QWLZl7VgcU4BZ4nWT2vAzhACqjna84RpAiPvAkaGVYyiqaXJBcVJ6blGesWJucWleel6yfm5 mxghgf51B+PSY1aHGAU4GJV4eDmAESDEmlhWXJl7iFGCg1lJhHdbBlCINyWxsiq1KD++qDQn tfgQIxMHp1QDI3vAQn+d3i/5rdvOf1Xvvh0cUMCiViUyQyNKvHthnkGPhXRo4NVVKu1Huvqf 34sw88n8WCMuGX/Q6uyWDuXGyiknVO8+Y5sWoNh0kHPTEo9Cgc//kypu9s592C7bv9N9wuk1 xSLiYSYqWmcO852d+dGcccqOxuhFU2/sS4naM6v+dNOa7bbvlViKMxINtZiLihMBX3vTj1IC AAA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130820_095329_329494_6069893A X-CRM114-Status: UNSURE ( 8.74 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -9.7 (---------) Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, Kukjin Kim , ian.campbell@citrix.com, pawel.moll@arm.com, swarren@wwwdotorg.org, Arnd Bergmann , Tomasz Figa , rob.herring@calxeda.com, Kyungmin Park , Thomas Abraham , Sylwester Nawrocki , galak@codeaurora.org, Olof Johansson , 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=-7.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 There is no need to use two cells for interrupt specifiers inside the MCT interrupt map, so this patch simplifies the map to use one cell. Signed-off-by: Tomasz Figa Signed-off-by: Kyungmin Park --- arch/arm/boot/dts/exynos4210.dtsi | 17 ++++++++--------- arch/arm/boot/dts/exynos4x12.dtsi | 14 +++++++------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi index 1a6440ae6..b0fee69 100644 --- a/arch/arm/boot/dts/exynos4210.dtsi +++ b/arch/arm/boot/dts/exynos4210.dtsi @@ -52,21 +52,20 @@ compatible = "samsung,exynos4210-mct"; reg = <0x10050000 0x800>; interrupt-parent = <&mct_map>; - interrupts = <0 0>, <1 0>, <2 0>, <3 0>, - <4 0>, <5 0>; + interrupts = <0>, <1>, <2>, <3>, <4>, <5>; clocks = <&clock 3>, <&clock 344>; clock-names = "fin_pll", "mct"; mct_map: mct-map { - #interrupt-cells = <2>; + #interrupt-cells = <1>; #address-cells = <0>; #size-cells = <0>; - interrupt-map = <0x0 0 &gic 0 57 0>, - <0x1 0 &gic 0 69 0>, - <0x2 0 &combiner 12 6>, - <0x3 0 &combiner 12 7>, - <0x4 0 &gic 0 42 0>, - <0x5 0 &gic 0 48 0>; + interrupt-map = <0 &gic 0 57 0>, + <1 &gic 0 69 0>, + <2 &combiner 12 6>, + <3 &combiner 12 7>, + <4 &gic 0 42 0>, + <5 &gic 0 48 0>; }; }; diff --git a/arch/arm/boot/dts/exynos4x12.dtsi b/arch/arm/boot/dts/exynos4x12.dtsi index 5012bc8..3d7182a 100644 --- a/arch/arm/boot/dts/exynos4x12.dtsi +++ b/arch/arm/boot/dts/exynos4x12.dtsi @@ -45,19 +45,19 @@ compatible = "samsung,exynos4412-mct"; reg = <0x10050000 0x800>; interrupt-parent = <&mct_map>; - interrupts = <0 0>, <1 0>, <2 0>, <3 0>, <4 0>; + interrupts = <0>, <1>, <2>, <3>, <4>; clocks = <&clock 3>, <&clock 344>; clock-names = "fin_pll", "mct"; mct_map: mct-map { - #interrupt-cells = <2>; + #interrupt-cells = <1>; #address-cells = <0>; #size-cells = <0>; - interrupt-map = <0x0 0 &gic 0 57 0>, - <0x1 0 &combiner 12 5>, - <0x2 0 &combiner 12 6>, - <0x3 0 &combiner 12 7>, - <0x4 0 &gic 1 12 0>; + interrupt-map = <0 &gic 0 57 0>, + <1 &combiner 12 5>, + <2 &combiner 12 6>, + <3 &combiner 12 7>, + <4 &gic 1 12 0>; }; };