233 lines
8.1 KiB
Diff
233 lines
8.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Samuel Holland <samuel@sholland.org>
|
|
Date: Fri, 25 Dec 2020 01:56:58 -0600
|
|
Subject: [PATCH] arm64: dts: allwinner: Use the new r_intc binding
|
|
|
|
The binding of R_INTC was updated to allow specifying interrupts other
|
|
than the external NMI, since routing those interrupts through the R_INTC
|
|
driver allows using them for wakeup.
|
|
|
|
Update the device trees to use the new binding.
|
|
|
|
Signed-off-by: Samuel Holland <samuel@sholland.org>
|
|
---
|
|
arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts | 2 +-
|
|
arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 2 +-
|
|
arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 2 +-
|
|
arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts | 2 +-
|
|
arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 2 +-
|
|
arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 2 +-
|
|
arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts | 2 +-
|
|
arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 2 +-
|
|
arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts | 2 +-
|
|
arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi | 2 +-
|
|
arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts | 2 +-
|
|
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 2 +-
|
|
arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 2 +-
|
|
arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 2 +-
|
|
arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 2 +-
|
|
arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts | 4 ++--
|
|
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 5 ++---
|
|
17 files changed, 19 insertions(+), 20 deletions(-)
|
|
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts
|
|
@@ -173,7 +173,7 @@
|
|
compatible = "x-powers,axp803";
|
|
reg = <0x3a3>;
|
|
interrupt-parent = <&r_intc>;
|
|
- interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
|
+ interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
|
x-powers,drive-vbus-en; /* set N_VBUSEN as output pin */
|
|
};
|
|
};
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
|
|
@@ -191,7 +191,7 @@
|
|
compatible = "x-powers,axp803";
|
|
reg = <0x3a3>;
|
|
interrupt-parent = <&r_intc>;
|
|
- interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
|
+ interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
|
x-powers,drive-vbus-en; /* set N_VBUSEN as output pin */
|
|
};
|
|
};
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts
|
|
@@ -152,7 +152,7 @@
|
|
compatible = "x-powers,axp803";
|
|
reg = <0x3a3>;
|
|
interrupt-parent = <&r_intc>;
|
|
- interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
|
+ interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
|
};
|
|
};
|
|
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts
|
|
@@ -185,7 +185,7 @@
|
|
compatible = "x-powers,axp803";
|
|
reg = <0x3a3>;
|
|
interrupt-parent = <&r_intc>;
|
|
- interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
|
+ interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
|
x-powers,drive-vbus-en; /* set N_VBUSEN as output pin */
|
|
};
|
|
};
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts
|
|
@@ -192,7 +192,7 @@
|
|
compatible = "x-powers,axp803";
|
|
reg = <0x3a3>;
|
|
interrupt-parent = <&r_intc>;
|
|
- interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
|
+ interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
|
x-powers,drive-vbus-en; /* set N_VBUSEN as output pin */
|
|
};
|
|
};
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
|
|
@@ -139,7 +139,7 @@
|
|
compatible = "x-powers,axp803";
|
|
reg = <0x3a3>;
|
|
interrupt-parent = <&r_intc>;
|
|
- interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
|
+ interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
|
};
|
|
};
|
|
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
|
|
@@ -248,7 +248,7 @@
|
|
compatible = "x-powers,axp803";
|
|
reg = <0x3a3>;
|
|
interrupt-parent = <&r_intc>;
|
|
- interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
|
+ interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
|
};
|
|
};
|
|
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
|
|
@@ -245,7 +245,7 @@
|
|
compatible = "x-powers,axp803";
|
|
reg = <0x3a3>;
|
|
interrupt-parent = <&r_intc>;
|
|
- interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
|
+ interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
|
};
|
|
};
|
|
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
|
|
@@ -266,7 +266,7 @@
|
|
compatible = "x-powers,axp803";
|
|
reg = <0x3a3>;
|
|
interrupt-parent = <&r_intc>;
|
|
- interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
|
+ interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
|
x-powers,drive-vbus-en;
|
|
};
|
|
};
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi
|
|
@@ -46,7 +46,7 @@
|
|
compatible = "x-powers,axp803";
|
|
reg = <0x3a3>;
|
|
interrupt-parent = <&r_intc>;
|
|
- interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
|
+ interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
|
};
|
|
};
|
|
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts
|
|
@@ -205,7 +205,7 @@
|
|
compatible = "x-powers,axp803";
|
|
reg = <0x3a3>;
|
|
interrupt-parent = <&r_intc>;
|
|
- interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
|
+ interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
|
wakeup-source;
|
|
};
|
|
};
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
|
@@ -1215,7 +1215,7 @@
|
|
compatible = "allwinner,sun50i-a64-r-intc",
|
|
"allwinner,sun6i-a31-r-intc";
|
|
interrupt-controller;
|
|
- #interrupt-cells = <2>;
|
|
+ #interrupt-cells = <3>;
|
|
reg = <0x01f00c00 0x400>;
|
|
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
|
|
};
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
|
|
@@ -157,7 +157,7 @@
|
|
compatible = "x-powers,axp805", "x-powers,axp806";
|
|
reg = <0x36>;
|
|
interrupt-parent = <&r_intc>;
|
|
- interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
|
+ interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>;
|
|
interrupt-controller;
|
|
#interrupt-cells = <1>;
|
|
x-powers,self-working-mode;
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
|
|
@@ -182,7 +182,7 @@
|
|
compatible = "x-powers,axp805", "x-powers,axp806";
|
|
reg = <0x36>;
|
|
interrupt-parent = <&r_intc>;
|
|
- interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
|
+ interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>;
|
|
interrupt-controller;
|
|
#interrupt-cells = <1>;
|
|
x-powers,self-working-mode;
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
|
|
@@ -119,7 +119,7 @@
|
|
compatible = "x-powers,axp805", "x-powers,axp806";
|
|
reg = <0x36>;
|
|
interrupt-parent = <&r_intc>;
|
|
- interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
|
+ interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>;
|
|
interrupt-controller;
|
|
#interrupt-cells = <1>;
|
|
x-powers,self-working-mode;
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
|
|
@@ -167,7 +167,7 @@
|
|
compatible = "x-powers,axp805", "x-powers,axp806";
|
|
reg = <0x36>;
|
|
interrupt-parent = <&r_intc>;
|
|
- interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
|
+ interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>;
|
|
interrupt-controller;
|
|
#interrupt-cells = <1>;
|
|
x-powers,self-working-mode;
|
|
@@ -280,7 +280,7 @@
|
|
compatible = "nxp,pcf8563";
|
|
reg = <0x51>;
|
|
interrupt-parent = <&r_intc>;
|
|
- interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
|
+ interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>;
|
|
#clock-cells = <0>;
|
|
};
|
|
};
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
|
|
@@ -931,10 +931,9 @@
|
|
};
|
|
|
|
r_intc: interrupt-controller@7021000 {
|
|
- compatible = "allwinner,sun50i-h6-r-intc",
|
|
- "allwinner,sun6i-a31-r-intc";
|
|
+ compatible = "allwinner,sun50i-h6-r-intc";
|
|
interrupt-controller;
|
|
- #interrupt-cells = <2>;
|
|
+ #interrupt-cells = <3>;
|
|
reg = <0x07021000 0x400>;
|
|
interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
|
|
};
|