Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753369AbaDDXOx (ORCPT ); Fri, 4 Apr 2014 19:14:53 -0400 Received: from mail-qc0-f172.google.com ([209.85.216.172]:34002 "EHLO mail-qc0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752328AbaDDXOs (ORCPT ); Fri, 4 Apr 2014 19:14:48 -0400 From: Soren Brinkmann To: Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Russell King , Michal Simek Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, =?UTF-8?q?S=C3=B6ren=20Brinkmann?= , Steffen Trumtrar , Mike Looijmans Subject: [PATCH v2 3/5] ARM: zynq: dt: Use #defines for interrupt specifiers Date: Fri, 4 Apr 2014 16:14:14 -0700 Message-Id: <1396653256-28397-4-git-send-email-soren.brinkmann@xilinx.com> X-Mailer: git-send-email 1.9.1.1.gbb9f595 In-Reply-To: <1396653256-28397-1-git-send-email-soren.brinkmann@xilinx.com> References: <1396653256-28397-1-git-send-email-soren.brinkmann@xilinx.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use #defines from the common include file to describe interrupt specifiers. Signed-off-by: Soren Brinkmann --- Changes in v2: None 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 66613d04de5d..36a34ffa30af 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"; @@ -44,7 +45,7 @@ pmu { compatible = "arm,cortex-a9-pmu"; - interrupts = <0 5 4>, <0 6 4>; + interrupts = , ; interrupt-parent = <&intc>; reg = < 0xf8891000 0x1000 0xf8893000 0x1000 >; }; @@ -80,7 +81,7 @@ clocks = <&clkc 23>, <&clkc 40>; clock-names = "ref_clk", "aper_clk"; reg = <0xE0000000 0x1000>; - interrupts = <0 27 4>; + interrupts = ; }; uart1: uart@e0001000 { @@ -89,14 +90,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"; }; @@ -105,7 +106,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"; }; @@ -116,7 +117,7 @@ clock-names = "clk_xin", "clk_ahb"; clocks = <&clkc 21>, <&clkc 32>; interrupt-parent = <&intc>; - interrupts = <0 24 4>; + interrupts = ; reg = <0xe0100000 0x1000>; } ; @@ -126,7 +127,7 @@ clock-names = "clk_xin", "clk_ahb"; clocks = <&clkc 22>, <&clkc 33>; interrupt-parent = <&intc>; - interrupts = <0 47 4>; + interrupts = ; reg = <0xe0101000 0x1000>; } ; @@ -160,14 +161,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>; @@ -175,14 +178,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>; -- 1.9.1.1.gbb9f595 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/