* [PATCH] ARM64: dts: meson-gx: consistently use the GIC_SPI and IRQ type macros
@ 2017-07-16 14:11 Martin Blumenstingl
2017-07-28 13:58 ` Neil Armstrong
2017-07-28 17:16 ` Kevin Hilman
0 siblings, 2 replies; 3+ messages in thread
From: Martin Blumenstingl @ 2017-07-16 14:11 UTC (permalink / raw)
To: linus-amlogic
the mailbox and ethmac nodes used the magic number "0" instead of the
GIC_SPI preprocessor macro. Additionally the ethmac used the magic
number "1" instead of IRQ_TYPE_EDGE_RISING.
Fix this to make the .dtsi easier to read.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
index 35b8c88c3220..492e6a24349a 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
@@ -437,9 +437,9 @@
mailbox: mailbox at 404 {
compatible = "amlogic,meson-gx-mhu", "amlogic,meson-gxbb-mhu";
reg = <0 0x404 0 0x4c>;
- interrupts = <0 208 IRQ_TYPE_EDGE_RISING>,
- <0 209 IRQ_TYPE_EDGE_RISING>,
- <0 210 IRQ_TYPE_EDGE_RISING>;
+ interrupts = <GIC_SPI 208 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 209 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 210 IRQ_TYPE_EDGE_RISING>;
#mbox-cells = <1>;
};
};
@@ -448,7 +448,7 @@
compatible = "amlogic,meson-gx-dwmac", "amlogic,meson-gxbb-dwmac", "snps,dwmac";
reg = <0x0 0xc9410000 0x0 0x10000
0x0 0xc8834540 0x0 0x4>;
- interrupts = <0 8 1>;
+ interrupts = <GIC_SPI 8 IRQ_TYPE_EDGE_RISING>;
interrupt-names = "macirq";
status = "disabled";
};
--
2.13.3
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] ARM64: dts: meson-gx: consistently use the GIC_SPI and IRQ type macros
2017-07-16 14:11 [PATCH] ARM64: dts: meson-gx: consistently use the GIC_SPI and IRQ type macros Martin Blumenstingl
@ 2017-07-28 13:58 ` Neil Armstrong
2017-07-28 17:16 ` Kevin Hilman
1 sibling, 0 replies; 3+ messages in thread
From: Neil Armstrong @ 2017-07-28 13:58 UTC (permalink / raw)
To: linus-amlogic
On 07/16/2017 04:11 PM, Martin Blumenstingl wrote:
> the mailbox and ethmac nodes used the magic number "0" instead of the
> GIC_SPI preprocessor macro. Additionally the ethmac used the magic
> number "1" instead of IRQ_TYPE_EDGE_RISING.
> Fix this to make the .dtsi easier to read.
>
> Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
> ---
> arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
> index 35b8c88c3220..492e6a24349a 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
> @@ -437,9 +437,9 @@
> mailbox: mailbox at 404 {
> compatible = "amlogic,meson-gx-mhu", "amlogic,meson-gxbb-mhu";
> reg = <0 0x404 0 0x4c>;
> - interrupts = <0 208 IRQ_TYPE_EDGE_RISING>,
> - <0 209 IRQ_TYPE_EDGE_RISING>,
> - <0 210 IRQ_TYPE_EDGE_RISING>;
> + interrupts = <GIC_SPI 208 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 209 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 210 IRQ_TYPE_EDGE_RISING>;
> #mbox-cells = <1>;
> };
> };
> @@ -448,7 +448,7 @@
> compatible = "amlogic,meson-gx-dwmac", "amlogic,meson-gxbb-dwmac", "snps,dwmac";
> reg = <0x0 0xc9410000 0x0 0x10000
> 0x0 0xc8834540 0x0 0x4>;
> - interrupts = <0 8 1>;
> + interrupts = <GIC_SPI 8 IRQ_TYPE_EDGE_RISING>;
> interrupt-names = "macirq";
> status = "disabled";
> };
>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] ARM64: dts: meson-gx: consistently use the GIC_SPI and IRQ type macros
2017-07-16 14:11 [PATCH] ARM64: dts: meson-gx: consistently use the GIC_SPI and IRQ type macros Martin Blumenstingl
2017-07-28 13:58 ` Neil Armstrong
@ 2017-07-28 17:16 ` Kevin Hilman
1 sibling, 0 replies; 3+ messages in thread
From: Kevin Hilman @ 2017-07-28 17:16 UTC (permalink / raw)
To: linus-amlogic
Martin Blumenstingl <martin.blumenstingl@googlemail.com> writes:
> the mailbox and ethmac nodes used the magic number "0" instead of the
> GIC_SPI preprocessor macro. Additionally the ethmac used the magic
> number "1" instead of IRQ_TYPE_EDGE_RISING.
> Fix this to make the .dtsi easier to read.
>
> Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Applied to v4.14/dt64,
Kevin
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-07-28 17:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-16 14:11 [PATCH] ARM64: dts: meson-gx: consistently use the GIC_SPI and IRQ type macros Martin Blumenstingl
2017-07-28 13:58 ` Neil Armstrong
2017-07-28 17:16 ` Kevin Hilman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®