* [PATCH] ARM: dts: emev2:use GIC_* defines @ 2016-01-28 1:29 Simon Horman 2016-01-28 8:15 ` Geert Uytterhoeven 0 siblings, 1 reply; 4+ messages in thread From: Simon Horman @ 2016-01-28 1:29 UTC (permalink / raw) To: linux-arm-kernel Use GIC_* defines for GIC interrupt cells in emev2 device tree. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- Based on renesas-devel-20160127-v4.5-rc1 --- arch/arm/boot/dts/emev2.dtsi | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/arch/arm/boot/dts/emev2.dtsi b/arch/arm/boot/dts/emev2.dtsi index 57795da616cb..366e822367c7 100644 --- a/arch/arm/boot/dts/emev2.dtsi +++ b/arch/arm/boot/dts/emev2.dtsi @@ -9,6 +9,7 @@ */ #include "skeleton.dtsi" +#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/irq.h> / { @@ -53,7 +54,7 @@ pmu { compatible = "arm,cortex-a9-pmu"; - interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>, + interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>, <0 121 IRQ_TYPE_LEVEL_HIGH>; }; @@ -158,7 +159,7 @@ timer at e0180000 { compatible = "renesas,em-sti"; reg = <0xe0180000 0x54>; - interrupts = <0 125 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>; clocks = <&sti_sclk>; clock-names = "sclk"; }; @@ -166,7 +167,7 @@ uart0: serial at e1020000 { compatible = "renesas,em-uart"; reg = <0xe1020000 0x38>; - interrupts = <0 8 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; clocks = <&usia_u0_sclk>; clock-names = "sclk"; }; @@ -174,7 +175,7 @@ uart1: serial at e1030000 { compatible = "renesas,em-uart"; reg = <0xe1030000 0x38>; - interrupts = <0 9 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; clocks = <&usib_u1_sclk>; clock-names = "sclk"; }; @@ -182,7 +183,7 @@ uart2: serial at e1040000 { compatible = "renesas,em-uart"; reg = <0xe1040000 0x38>; - interrupts = <0 10 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; clocks = <&usib_u2_sclk>; clock-names = "sclk"; }; @@ -190,7 +191,7 @@ uart3: serial at e1050000 { compatible = "renesas,em-uart"; reg = <0xe1050000 0x38>; - interrupts = <0 11 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>; clocks = <&usib_u3_sclk>; clock-names = "sclk"; }; @@ -203,8 +204,8 @@ gpio0: gpio at e0050000 { compatible = "renesas,em-gio"; reg = <0xe0050000 0x2c>, <0xe0050040 0x20>; - interrupts = <0 67 IRQ_TYPE_LEVEL_HIGH>, - <0 68 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>; gpio-controller; gpio-ranges = <&pfc 0 0 32>; #gpio-cells = <2>; @@ -215,8 +216,8 @@ gpio1: gpio at e0050080 { compatible = "renesas,em-gio"; reg = <0xe0050080 0x2c>, <0xe00500c0 0x20>; - interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>, - <0 70 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>; gpio-controller; gpio-ranges = <&pfc 0 32 32>; #gpio-cells = <2>; @@ -227,8 +228,8 @@ gpio2: gpio at e0050100 { compatible = "renesas,em-gio"; reg = <0xe0050100 0x2c>, <0xe0050140 0x20>; - interrupts = <0 71 IRQ_TYPE_LEVEL_HIGH>, - <0 72 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>; gpio-controller; gpio-ranges = <&pfc 0 64 32>; #gpio-cells = <2>; @@ -239,8 +240,8 @@ gpio3: gpio at e0050180 { compatible = "renesas,em-gio"; reg = <0xe0050180 0x2c>, <0xe00501c0 0x20>; - interrupts = <0 73 IRQ_TYPE_LEVEL_HIGH>, - <0 74 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>; gpio-controller; gpio-ranges = <&pfc 0 96 32>; #gpio-cells = <2>; @@ -251,8 +252,8 @@ gpio4: gpio at e0050200 { compatible = "renesas,em-gio"; reg = <0xe0050200 0x2c>, <0xe0050240 0x20>; - interrupts = <0 75 IRQ_TYPE_LEVEL_HIGH>, - <0 76 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>; gpio-controller; gpio-ranges = <&pfc 0 128 31>; #gpio-cells = <2>; @@ -266,7 +267,7 @@ #size-cells = <0>; compatible = "renesas,iic-emev2"; reg = <0xe0070000 0x28>; - interrupts = <0 32 IRQ_TYPE_EDGE_RISING>; + interrupts = <GIC_SPI 32 IRQ_TYPE_EDGE_RISING>; clocks = <&iic0_sclk>; clock-names = "sclk"; status = "disabled"; @@ -277,7 +278,7 @@ #size-cells = <0>; compatible = "renesas,iic-emev2"; reg = <0xe10a0000 0x28>; - interrupts = <0 33 IRQ_TYPE_EDGE_RISING>; + interrupts = <GIC_SPI 33 IRQ_TYPE_EDGE_RISING>; clocks = <&iic1_sclk>; clock-names = "sclk"; status = "disabled"; -- 2.1.4 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] ARM: dts: emev2:use GIC_* defines 2016-01-28 1:29 [PATCH] ARM: dts: emev2:use GIC_* defines Simon Horman @ 2016-01-28 8:15 ` Geert Uytterhoeven 2016-01-29 0:26 ` Simon Horman 0 siblings, 1 reply; 4+ messages in thread From: Geert Uytterhoeven @ 2016-01-28 8:15 UTC (permalink / raw) To: linux-arm-kernel Hi Simon, On Thu, Jan 28, 2016 at 2:29 AM, Simon Horman <horms+renesas@verge.net.au> wrote: > Use GIC_* defines for GIC interrupt cells in emev2 device tree. > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > --- > Based on renesas-devel-20160127-v4.5-rc1 > --- > arch/arm/boot/dts/emev2.dtsi | 37 +++++++++++++++++++------------------ > 1 file changed, 19 insertions(+), 18 deletions(-) > > diff --git a/arch/arm/boot/dts/emev2.dtsi b/arch/arm/boot/dts/emev2.dtsi > index 57795da616cb..366e822367c7 100644 > --- a/arch/arm/boot/dts/emev2.dtsi > +++ b/arch/arm/boot/dts/emev2.dtsi > @@ -9,6 +9,7 @@ > */ > > #include "skeleton.dtsi" > +#include <dt-bindings/interrupt-controller/arm-gic.h> > #include <dt-bindings/interrupt-controller/irq.h> > > / { > @@ -53,7 +54,7 @@ > > pmu { > compatible = "arm,cortex-a9-pmu"; > - interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>, > + interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>, > <0 121 IRQ_TYPE_LEVEL_HIGH>; If you convert the above line, too, you can add my Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ARM: dts: emev2:use GIC_* defines 2016-01-28 8:15 ` Geert Uytterhoeven @ 2016-01-29 0:26 ` Simon Horman 2016-01-29 0:35 ` Simon Horman 0 siblings, 1 reply; 4+ messages in thread From: Simon Horman @ 2016-01-29 0:26 UTC (permalink / raw) To: linux-arm-kernel On Thu, Jan 28, 2016 at 09:15:50AM +0100, Geert Uytterhoeven wrote: > Hi Simon, > > On Thu, Jan 28, 2016 at 2:29 AM, Simon Horman > <horms+renesas@verge.net.au> wrote: > > Use GIC_* defines for GIC interrupt cells in emev2 device tree. > > > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > --- > > Based on renesas-devel-20160127-v4.5-rc1 > > --- > > arch/arm/boot/dts/emev2.dtsi | 37 +++++++++++++++++++------------------ > > 1 file changed, 19 insertions(+), 18 deletions(-) > > > > diff --git a/arch/arm/boot/dts/emev2.dtsi b/arch/arm/boot/dts/emev2.dtsi > > index 57795da616cb..366e822367c7 100644 > > --- a/arch/arm/boot/dts/emev2.dtsi > > +++ b/arch/arm/boot/dts/emev2.dtsi > > @@ -9,6 +9,7 @@ > > */ > > > > #include "skeleton.dtsi" > > +#include <dt-bindings/interrupt-controller/arm-gic.h> > > #include <dt-bindings/interrupt-controller/irq.h> > > > > / { > > @@ -53,7 +54,7 @@ > > > > pmu { > > compatible = "arm,cortex-a9-pmu"; > > - interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>, > > + interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>, > > <0 121 IRQ_TYPE_LEVEL_HIGH>; > > If you convert the above line, too, you can add my > Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> Thanks, I have fixed that and queued up the following: From: Simon Horman <horms+renesas@verge.net.au> Date: Thu, 28 Jan 2016 10:29:54 +0900 Subject: [PATCH] ARM: dts: emev2:use GIC_* defines Use GIC_* defines for GIC interrupt cells in emev2 device tree. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> --- arch/arm/boot/dts/emev2.dtsi | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/arch/arm/boot/dts/emev2.dtsi b/arch/arm/boot/dts/emev2.dtsi index 57795da616cb..bcce6f50c93d 100644 --- a/arch/arm/boot/dts/emev2.dtsi +++ b/arch/arm/boot/dts/emev2.dtsi @@ -9,6 +9,7 @@ */ #include "skeleton.dtsi" +#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/irq.h> / { @@ -53,8 +54,8 @@ pmu { compatible = "arm,cortex-a9-pmu"; - interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>, - <0 121 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>; }; clocks at e0110000 { @@ -158,7 +159,7 @@ timer at e0180000 { compatible = "renesas,em-sti"; reg = <0xe0180000 0x54>; - interrupts = <0 125 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>; clocks = <&sti_sclk>; clock-names = "sclk"; }; @@ -166,7 +167,7 @@ uart0: serial at e1020000 { compatible = "renesas,em-uart"; reg = <0xe1020000 0x38>; - interrupts = <0 8 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; clocks = <&usia_u0_sclk>; clock-names = "sclk"; }; @@ -174,7 +175,7 @@ uart1: serial at e1030000 { compatible = "renesas,em-uart"; reg = <0xe1030000 0x38>; - interrupts = <0 9 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; clocks = <&usib_u1_sclk>; clock-names = "sclk"; }; @@ -182,7 +183,7 @@ uart2: serial at e1040000 { compatible = "renesas,em-uart"; reg = <0xe1040000 0x38>; - interrupts = <0 10 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; clocks = <&usib_u2_sclk>; clock-names = "sclk"; }; @@ -190,7 +191,7 @@ uart3: serial at e1050000 { compatible = "renesas,em-uart"; reg = <0xe1050000 0x38>; - interrupts = <0 11 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>; clocks = <&usib_u3_sclk>; clock-names = "sclk"; }; @@ -203,8 +204,8 @@ gpio0: gpio at e0050000 { compatible = "renesas,em-gio"; reg = <0xe0050000 0x2c>, <0xe0050040 0x20>; - interrupts = <0 67 IRQ_TYPE_LEVEL_HIGH>, - <0 68 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>; gpio-controller; gpio-ranges = <&pfc 0 0 32>; #gpio-cells = <2>; @@ -215,8 +216,8 @@ gpio1: gpio at e0050080 { compatible = "renesas,em-gio"; reg = <0xe0050080 0x2c>, <0xe00500c0 0x20>; - interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>, - <0 70 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>; gpio-controller; gpio-ranges = <&pfc 0 32 32>; #gpio-cells = <2>; @@ -227,8 +228,8 @@ gpio2: gpio at e0050100 { compatible = "renesas,em-gio"; reg = <0xe0050100 0x2c>, <0xe0050140 0x20>; - interrupts = <0 71 IRQ_TYPE_LEVEL_HIGH>, - <0 72 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>; gpio-controller; gpio-ranges = <&pfc 0 64 32>; #gpio-cells = <2>; @@ -239,8 +240,8 @@ gpio3: gpio at e0050180 { compatible = "renesas,em-gio"; reg = <0xe0050180 0x2c>, <0xe00501c0 0x20>; - interrupts = <0 73 IRQ_TYPE_LEVEL_HIGH>, - <0 74 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>; gpio-controller; gpio-ranges = <&pfc 0 96 32>; #gpio-cells = <2>; @@ -251,8 +252,8 @@ gpio4: gpio at e0050200 { compatible = "renesas,em-gio"; reg = <0xe0050200 0x2c>, <0xe0050240 0x20>; - interrupts = <0 75 IRQ_TYPE_LEVEL_HIGH>, - <0 76 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>; gpio-controller; gpio-ranges = <&pfc 0 128 31>; #gpio-cells = <2>; @@ -266,7 +267,7 @@ #size-cells = <0>; compatible = "renesas,iic-emev2"; reg = <0xe0070000 0x28>; - interrupts = <0 32 IRQ_TYPE_EDGE_RISING>; + interrupts = <GIC_SPI 32 IRQ_TYPE_EDGE_RISING>; clocks = <&iic0_sclk>; clock-names = "sclk"; status = "disabled"; @@ -277,7 +278,7 @@ #size-cells = <0>; compatible = "renesas,iic-emev2"; reg = <0xe10a0000 0x28>; - interrupts = <0 33 IRQ_TYPE_EDGE_RISING>; + interrupts = <GIC_SPI 33 IRQ_TYPE_EDGE_RISING>; clocks = <&iic1_sclk>; clock-names = "sclk"; status = "disabled"; -- 2.1.4 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] ARM: dts: emev2:use GIC_* defines 2016-01-29 0:26 ` Simon Horman @ 2016-01-29 0:35 ` Simon Horman 0 siblings, 0 replies; 4+ messages in thread From: Simon Horman @ 2016-01-29 0:35 UTC (permalink / raw) To: linux-arm-kernel On Fri, Jan 29, 2016 at 09:26:10AM +0900, Simon Horman wrote: > On Thu, Jan 28, 2016 at 09:15:50AM +0100, Geert Uytterhoeven wrote: > > Hi Simon, > > > > On Thu, Jan 28, 2016 at 2:29 AM, Simon Horman > > <horms+renesas@verge.net.au> wrote: > > > Use GIC_* defines for GIC interrupt cells in emev2 device tree. > > > > > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > > --- > > > Based on renesas-devel-20160127-v4.5-rc1 > > > --- > > > arch/arm/boot/dts/emev2.dtsi | 37 +++++++++++++++++++------------------ > > > 1 file changed, 19 insertions(+), 18 deletions(-) > > > > > > diff --git a/arch/arm/boot/dts/emev2.dtsi b/arch/arm/boot/dts/emev2.dtsi > > > index 57795da616cb..366e822367c7 100644 > > > --- a/arch/arm/boot/dts/emev2.dtsi > > > +++ b/arch/arm/boot/dts/emev2.dtsi > > > @@ -9,6 +9,7 @@ > > > */ > > > > > > #include "skeleton.dtsi" > > > +#include <dt-bindings/interrupt-controller/arm-gic.h> > > > #include <dt-bindings/interrupt-controller/irq.h> > > > > > > / { > > > @@ -53,7 +54,7 @@ > > > > > > pmu { > > > compatible = "arm,cortex-a9-pmu"; > > > - interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>, > > > + interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>, > > > <0 121 IRQ_TYPE_LEVEL_HIGH>; > > > > If you convert the above line, too, you can add my > > Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> > > Thanks, I have fixed that and queued up the following: > > From: Simon Horman <horms+renesas@verge.net.au> > Date: Thu, 28 Jan 2016 10:29:54 +0900 > Subject: [PATCH] ARM: dts: emev2:use GIC_* defines I subsequently corrected the subject so there is a space after "emev2:". Sorry for letting that get this far. [snip] ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-01-29 0:35 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-01-28 1:29 [PATCH] ARM: dts: emev2:use GIC_* defines Simon Horman 2016-01-28 8:15 ` Geert Uytterhoeven 2016-01-29 0:26 ` Simon Horman 2016-01-29 0:35 ` Simon Horman
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).