From patchwork Fri Apr 4 22:00:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soren Brinkmann X-Patchwork-Id: 3941141 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 28FD09F357 for ; Fri, 4 Apr 2014 22:02:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4F2462015D for ; Fri, 4 Apr 2014 22:02:02 +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 0EC73200F3 for ; Fri, 4 Apr 2014 22:02:01 +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 1WWCAr-0003pt-BP; Fri, 04 Apr 2014 22:01:21 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WWCAj-0000El-6U; Fri, 04 Apr 2014 22:01:13 +0000 Received: from mail-qa0-x22e.google.com ([2607:f8b0:400d:c00::22e]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WWCAZ-0000C7-1i for linux-arm-kernel@lists.infradead.org; Fri, 04 Apr 2014 22:01:04 +0000 Received: by mail-qa0-f46.google.com with SMTP id dc16so502066qab.5 for ; Fri, 04 Apr 2014 15:00:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=WysIUNXynb/hsz9MV9ILf7sdBTDeNGc6nrb4630wAoI=; b=iPwhOAPD4IogPdxw8EuEoc0HtPcQobmmKGk7OoQBUhJx+hmsj/fcCNwg4WYS7u3ggc PYwrS5pMy3Vs18Zq7Z5YcIiLK3jqGiT25M6iYFgCc7qBdmnAB3rmnTXW+1o2acbBdk7A XlIcsarWFqsJ7TVeT4C3CMdKJbCRaxSRU6LtdaWBAeVUJnWt5KVqHt/kLPMjDtFV71WW gltycb51i6AL9uSSwyNfZ9XIMiFrLUm7uSoIXi6Yn6g+I1y9s+k6DPUr1K8JIJ7HBT9l 8De+ur6sKJ3h9swfdPV73ie70nJQ98fHVHxXn68nYg2UZYQfxvJyOixlkOap8zcGhohc nvAg== X-Received: by 10.140.42.38 with SMTP id b35mr2274266qga.87.1396648841886; Fri, 04 Apr 2014 15:00:41 -0700 (PDT) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id w35sm12766368qgw.4.2014.04.04.15.00.40 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 04 Apr 2014 15:00:41 -0700 (PDT) From: Soren Brinkmann To: Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Russell King , Michal Simek Subject: [PATCH 2/2] ARM: zynq: dt: Use #defines for interrupt specifiers Date: Fri, 4 Apr 2014 15:00:31 -0700 Message-Id: <1396648831-7570-2-git-send-email-soren.brinkmann@xilinx.com> X-Mailer: git-send-email 1.9.1.1.gbb9f595 In-Reply-To: <1396648831-7570-1-git-send-email-soren.brinkmann@xilinx.com> References: <1396648831-7570-1-git-send-email-soren.brinkmann@xilinx.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140404_180103_241682_D969EDC5 X-CRM114-Status: UNSURE ( 9.75 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) Cc: =?UTF-8?q?S=C3=B6ren=20Brinkmann?= , devicetree@vger.kernel.org, Steffen Trumtrar , linux-kernel@vger.kernel.org, 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.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Use #defines from the common include file to describe interrupt specifiers. Signed-off-by: Soren Brinkmann --- --- arch/arm/boot/dts/zynq-7000.dtsi | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi index b028278b7f49..a219a927c0e4 100644 --- a/arch/arm/boot/dts/zynq-7000.dtsi +++ b/arch/arm/boot/dts/zynq-7000.dtsi @@ -12,6 +12,7 @@ */ #include "skeleton.dtsi" +#include / { compatible = "xlnx,zynq-7000"; @@ -43,7 +44,7 @@ pmu { compatible = "arm,cortex-a9-pmu"; - interrupts = <0 5 4>, <0 6 4>; + interrupts = , ; interrupt-parent = <&intc>; reg = < 0xf8891000 0x1000 0xf8893000 0x1000 >; }; @@ -79,7 +80,7 @@ clocks = <&clkc 23>, <&clkc 40>; clock-names = "ref_clk", "aper_clk"; reg = <0xE0000000 0x1000>; - interrupts = <0 27 4>; + interrupts = ; }; uart1: uart@e0001000 { @@ -88,14 +89,14 @@ clocks = <&clkc 24>, <&clkc 41>; clock-names = "ref_clk", "aper_clk"; reg = <0xE0001000 0x1000>; - interrupts = <0 50 4>; + interrupts = ; }; gem0: ethernet@e000b000 { compatible = "cdns,gem"; reg = <0xe000b000 0x4000>; status = "disabled"; - interrupts = <0 22 4>; + interrupts = ; clocks = <&clkc 30>, <&clkc 30>, <&clkc 13>; clock-names = "pclk", "hclk", "tx_clk"; }; @@ -104,7 +105,7 @@ compatible = "cdns,gem"; reg = <0xe000c000 0x4000>; status = "disabled"; - interrupts = <0 45 4>; + interrupts = ; clocks = <&clkc 31>, <&clkc 31>, <&clkc 14>; clock-names = "pclk", "hclk", "tx_clk"; }; @@ -115,7 +116,7 @@ clock-names = "clk_xin", "clk_ahb"; clocks = <&clkc 21>, <&clkc 32>; interrupt-parent = <&intc>; - interrupts = <0 24 4>; + interrupts = ; reg = <0xe0100000 0x1000>; } ; @@ -125,7 +126,7 @@ clock-names = "clk_xin", "clk_ahb"; clocks = <&clkc 22>, <&clkc 33>; interrupt-parent = <&intc>; - interrupts = <0 47 4>; + interrupts = ; reg = <0xe0101000 0x1000>; } ; @@ -159,14 +160,16 @@ global_timer: timer@f8f00200 { compatible = "arm,cortex-a9-global-timer"; reg = <0xf8f00200 0x20>; - interrupts = <1 11 0x301>; + interrupts = ; interrupt-parent = <&intc>; clocks = <&clkc 4>; }; ttc0: ttc0@f8001000 { interrupt-parent = <&intc>; - interrupts = < 0 10 4 0 11 4 0 12 4 >; + interrupts = , + , + ; compatible = "cdns,ttc"; clocks = <&clkc 6>; reg = <0xF8001000 0x1000>; @@ -174,14 +177,16 @@ ttc1: ttc1@f8002000 { interrupt-parent = <&intc>; - interrupts = < 0 37 4 0 38 4 0 39 4 >; + interrupts = , + , + ; compatible = "cdns,ttc"; clocks = <&clkc 6>; reg = <0xF8002000 0x1000>; }; scutimer: scutimer@f8f00600 { interrupt-parent = <&intc>; - interrupts = < 1 13 0x301 >; + interrupts = ; compatible = "arm,cortex-a9-twd-timer"; reg = < 0xf8f00600 0x20 >; clocks = <&clkc 4>;