* [PATCH 1/2] ARM: zynq: dt: Convert to preprocessor includes @ 2014-04-04 22:00 Soren Brinkmann 2014-04-04 22:00 ` [PATCH 2/2] ARM: zynq: dt: Use #defines for interrupt specifiers Soren Brinkmann 2014-04-04 22:41 ` [PATCH 1/2] ARM: zynq: dt: Convert to preprocessor includes Sören Brinkmann 0 siblings, 2 replies; 3+ messages in thread From: Soren Brinkmann @ 2014-04-04 22:00 UTC (permalink / raw) To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Russell King, Michal Simek Cc: devicetree-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-kernel-u79uwXL29TY76Z2rM5mHXA, Sören Brinkmann, Steffen Trumtrar Convert all Zynq DT files to the dtc preprocessor include syntax. This allows to include header files in the devicetrees like other SoC-types already do. Inspired-by: Steffen Trumtrar <s.trumtrar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> (http://www.spinics.net/lists/arm-kernel/msg319832.html) Signed-off-by: Soren Brinkmann <soren.brinkmann-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org> --- arch/arm/boot/dts/zynq-7000.dtsi | 3 ++- arch/arm/boot/dts/zynq-zc702.dts | 2 +- arch/arm/boot/dts/zynq-zc706.dts | 2 +- arch/arm/boot/dts/zynq-zed.dts | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi index 789d0bacc110..b028278b7f49 100644 --- a/arch/arm/boot/dts/zynq-7000.dtsi +++ b/arch/arm/boot/dts/zynq-7000.dtsi @@ -10,7 +10,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ -/include/ "skeleton.dtsi" + +#include "skeleton.dtsi" / { compatible = "xlnx,zynq-7000"; diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts index c913f77a21eb..07713d3c716a 100644 --- a/arch/arm/boot/dts/zynq-zc702.dts +++ b/arch/arm/boot/dts/zynq-zc702.dts @@ -12,7 +12,7 @@ * GNU General Public License for more details. */ /dts-v1/; -/include/ "zynq-7000.dtsi" +#include "zynq-7000.dtsi" / { model = "Zynq ZC702 Development Board"; diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts index 88f62c50382e..cf6566cdb02a 100644 --- a/arch/arm/boot/dts/zynq-zc706.dts +++ b/arch/arm/boot/dts/zynq-zc706.dts @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ /dts-v1/; -/include/ "zynq-7000.dtsi" +#include "zynq-7000.dtsi" / { model = "Zynq ZC706 Development Board"; diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zed.dts index 82d7ef1a9a9c..1541716e2cfb 100644 --- a/arch/arm/boot/dts/zynq-zed.dts +++ b/arch/arm/boot/dts/zynq-zed.dts @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ /dts-v1/; -/include/ "zynq-7000.dtsi" +#include "zynq-7000.dtsi" / { model = "Zynq Zed Development Board"; -- 1.9.1.1.gbb9f595 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] ARM: zynq: dt: Use #defines for interrupt specifiers 2014-04-04 22:00 [PATCH 1/2] ARM: zynq: dt: Convert to preprocessor includes Soren Brinkmann @ 2014-04-04 22:00 ` Soren Brinkmann 2014-04-04 22:41 ` [PATCH 1/2] ARM: zynq: dt: Convert to preprocessor includes Sören Brinkmann 1 sibling, 0 replies; 3+ messages in thread From: Soren Brinkmann @ 2014-04-04 22:00 UTC (permalink / raw) To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Russell King, Michal Simek Cc: devicetree, linux-arm-kernel, linux-kernel, Sören Brinkmann, Steffen Trumtrar Use #defines from the common include file to describe interrupt specifiers. Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> --- --- 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 <dt-bindings/interrupt-controller/arm-gic.h> / { compatible = "xlnx,zynq-7000"; @@ -43,7 +44,7 @@ pmu { compatible = "arm,cortex-a9-pmu"; - interrupts = <0 5 4>, <0 6 4>; + interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>; 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 = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>; }; 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 = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>; }; gem0: ethernet@e000b000 { compatible = "cdns,gem"; reg = <0xe000b000 0x4000>; status = "disabled"; - interrupts = <0 22 4>; + interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>; 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 = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>; 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 = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>; 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 = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>; 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 = <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_EDGE_RISING)>; interrupt-parent = <&intc>; clocks = <&clkc 4>; }; ttc0: ttc0@f8001000 { interrupt-parent = <&intc>; - interrupts = < 0 10 4 0 11 4 0 12 4 >; + interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>; 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 = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; compatible = "cdns,ttc"; clocks = <&clkc 6>; reg = <0xF8002000 0x1000>; }; scutimer: scutimer@f8f00600 { interrupt-parent = <&intc>; - interrupts = < 1 13 0x301 >; + interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_EDGE_RISING)>; compatible = "arm,cortex-a9-twd-timer"; reg = < 0xf8f00600 0x20 >; clocks = <&clkc 4>; -- 1.9.1.1.gbb9f595 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] ARM: zynq: dt: Convert to preprocessor includes 2014-04-04 22:00 [PATCH 1/2] ARM: zynq: dt: Convert to preprocessor includes Soren Brinkmann 2014-04-04 22:00 ` [PATCH 2/2] ARM: zynq: dt: Use #defines for interrupt specifiers Soren Brinkmann @ 2014-04-04 22:41 ` Sören Brinkmann 1 sibling, 0 replies; 3+ messages in thread From: Sören Brinkmann @ 2014-04-04 22:41 UTC (permalink / raw) To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Russell King, Michal Simek Cc: devicetree, Steffen Trumtrar, linux-kernel, linux-arm-kernel Sorry this accidentally went out too early. I meant to include patches to convert the clocks as well. I'll send a v2 to include those patches. Sören _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-04-04 22:41 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-04-04 22:00 [PATCH 1/2] ARM: zynq: dt: Convert to preprocessor includes Soren Brinkmann 2014-04-04 22:00 ` [PATCH 2/2] ARM: zynq: dt: Use #defines for interrupt specifiers Soren Brinkmann 2014-04-04 22:41 ` [PATCH 1/2] ARM: zynq: dt: Convert to preprocessor includes Sören Brinkmann
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).