From patchwork Fri Jun 14 14:41:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chander Kashyap X-Patchwork-Id: 2721961 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 DC0769F8E4 for ; Fri, 14 Jun 2013 14:41:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7AEB42025F for ; Fri, 14 Jun 2013 14:41:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1066120251 for ; Fri, 14 Jun 2013 14:41:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753186Ab3FNOll (ORCPT ); Fri, 14 Jun 2013 10:41:41 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:57234 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752418Ab3FNOll (ORCPT ); Fri, 14 Jun 2013 10:41:41 -0400 Received: by mail-pa0-f47.google.com with SMTP id kl14so715452pab.34 for ; Fri, 14 Jun 2013 07:41:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=9zj0Nwpbhrj+LFBtns43Df2ERD5ZzI71yMhO1q1w+qY=; b=QglAc9qua6BLefteH3/fet/Qmp9JOe8519rcdp4P/fDZKQF/g/h6fL7qa4BuDhBmcv bqUm++WVfUmXLNP25XRr6qRJ0ybkDZe2I+4wnxc8TTV+jPfU4h3uKVZ4ihlrF4UUkckZ 1IE8grv9TO1IwFkdPxYOg7ICzGu8ST70f+AFG4AqT1oKZ2ny9e9Ye6W5WH7rhpAvmp8F a1LJc2LAuEYGqREd/f+yOp9GQ38jChwYlbPZbTHeSbBfHgXy4HeZpwS1EDxbqCNgloA0 J9DugrOHaRbVhCzpESJZd8jJWGPovcVlRwQ8dPKNUWJmQ5MQ7TNqIC2X1aeSrDq13qTj YA4w== X-Received: by 10.66.121.108 with SMTP id lj12mr2909433pab.52.1371220900537; Fri, 14 Jun 2013 07:41:40 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPSA id v7sm2514979pbq.32.2013.06.14.07.41.37 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 14 Jun 2013 07:41:39 -0700 (PDT) From: Chander Kashyap To: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org, kgene.kim@samsung.com, t.figa@samsung.com, thomas.ab@samsung.com, Chander Kashyap Subject: [PATCH] ARM: DT: Exynos: fix number of interrupt-cells in mct node Date: Fri, 14 Jun 2013 20:11:26 +0530 Message-Id: <1371220886-11616-1-git-send-email-chander.kashyap@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-Gm-Message-State: ALoCoQnBZhNr9p0fKJs1JD0pV4JO2qeDeK0n/lpzGOWohyAM/GCp7hvFLr28elKKuVBDc+Uazet3 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.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Two cells were used to specify interrupts in mct node, while second cell always remains unused. Hence use only one cell. Suggested by Tomasz Figa. Signed-off-by: Chander Kashyap --- arch/arm/boot/dts/exynos4210.dtsi | 19 +++++++++---------- arch/arm/boot/dts/exynos4212.dtsi | 19 +++++++++---------- arch/arm/boot/dts/exynos4412.dtsi | 23 +++++++++++------------ arch/arm/boot/dts/exynos5250.dtsi | 19 +++++++++---------- 4 files changed, 38 insertions(+), 42 deletions(-) diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi index 54710de..ad50010 100644 --- a/arch/arm/boot/dts/exynos4210.dtsi +++ b/arch/arm/boot/dts/exynos4210.dtsi @@ -52,23 +52,22 @@ compatible = "samsung,exynos4210-mct"; reg = <0x10050000 0x800>; interrupt-controller; - #interrups-cells = <2>; + #interrups-cells = <1>; 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/exynos4212.dtsi b/arch/arm/boot/dts/exynos4212.dtsi index c0f60f4..ba9ada1 100644 --- a/arch/arm/boot/dts/exynos4212.dtsi +++ b/arch/arm/boot/dts/exynos4212.dtsi @@ -39,21 +39,20 @@ compatible = "samsung,exynos4412-mct"; reg = <0x10050000 0x800>; interrupt-controller; - #interrups-cells = <2>; + #interrups-cells = <1>; interrupt-parent = <&mct_map>; - interrupts = <0 0>, <1 0>, <2 0>, <3 0>, - <4 0>, <5 0>; + interrupts = <0>, <1>, <2>, <3>, <4>, <5>; mct_map: mct-map { - #interrupt-cells = <2>; + #interrupt-cells = <>; #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>, - <0x5 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>, + <5 &gic 1 12 0>; }; }; }; diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi index 270b389..a680de7 100644 --- a/arch/arm/boot/dts/exynos4412.dtsi +++ b/arch/arm/boot/dts/exynos4412.dtsi @@ -39,25 +39,24 @@ compatible = "samsung,exynos4412-mct"; reg = <0x10050000 0x800>; interrupt-controller; - #interrups-cells = <2>; + #interrups-cells = <1>; interrupt-parent = <&mct_map>; - interrupts = <0 0>, <1 0>, <2 0>, <3 0>, - <4 0>, <5 0>, <6 0>, <7 0>; + interrupts = <0>, <1>, <2>, <3>, <4>, <5>, <6>, <7>; 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>, - <0x5 0 &gic 1 12 0>, - <0x6 0 &gic 1 12 0>, - <0x7 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>, + <5 &gic 1 12 0>, + <6 &gic 1 12 0>, + <7 &gic 1 12 0>; }; }; diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index a7cf3f5..4e633ef 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -94,23 +94,22 @@ compatible = "samsung,exynos4210-mct"; reg = <0x101C0000 0x800>; interrupt-controller; - #interrups-cells = <2>; + #interrups-cells = <1>; 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 1>, <&clock 335>; 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 &combiner 23 3>, - <0x1 0 &combiner 23 4>, - <0x2 0 &combiner 25 2>, - <0x3 0 &combiner 25 3>, - <0x4 0 &gic 0 120 0>, - <0x5 0 &gic 0 121 0>; + interrupt-map = <0 &combiner 23 3>, + <1 &combiner 23 4>, + <2 &combiner 25 2>, + <3 &combiner 25 3>, + <4 &gic 0 120 0>, + <5 &gic 0 121 0>; }; };