ARM: sunxi: DT: Convert the DTs to use the generic interrupt header

The NMI IRQ controller uses the standard flags definition for the IRQ level and
edges.

Use the common header to use defines instead of opaque numbers.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi.dts b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
index d5e5d39ff3c00a0be89ba313f74a44da6912abbb..4b0cd776c5c528c73a2be0e44fb2bbc0811ac6fd 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-bananapi.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
@@ -52,6 +52,7 @@
 #include "sunxi-common-regulators.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/pinctrl/sun4i-a10.h>
 
 / {
@@ -157,7 +158,7 @@
                                compatible = "x-powers,axp209";
                                reg = <0x34>;
                                interrupt-parent = <&nmi_intc>;
-                               interrupts = <0 8>;
+                               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
 
                                interrupt-controller;
                                #interrupt-cells = <1>;

diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
index 9dc4c10f682e4bd178410f080a1fd000cbf1ba8f..18fc5db9c97679906e9ecbb14f682929e9d828c9 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
@@ -16,6 +16,7 @@
 #include "sunxi-common-regulators.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/pinctrl/sun4i-a10.h>
 
 / {
@@ -90,7 +91,7 @@
                                compatible = "x-powers,axp209";
                                reg = <0x34>;
                                interrupt-parent = <&nmi_intc>;
-                               interrupts = <0 8>;
+                               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
 
                                interrupt-controller;
                                #interrupt-cells = <1>;

diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
index 673846245cd9053ba2fd4921d1043bf8d699c822..77bc7e79cab984f4adbe6d2033b45197635b3256 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
@@ -16,6 +16,7 @@
 #include "sunxi-common-regulators.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/pinctrl/sun4i-a10.h>
 
 / {
@@ -132,7 +133,7 @@
                                compatible = "x-powers,axp209";
                                reg = <0x34>;
                                interrupt-parent = <&nmi_intc>;
-                               interrupts = <0 8>;
+                               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
 
                                interrupt-controller;
                                #interrupt-cells = <1>;

diff --git a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
index 4356a1709559d76f6ade28eea5983caa898856cc..4d6a88ec8c0f9c16a46ff8d646b463c4f865697a 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
+++ b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
@@ -16,6 +16,7 @@
 #include "sunxi-common-regulators.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/pinctrl/sun4i-a10.h>
 
 / {
@@ -150,7 +151,7 @@
                                compatible = "x-powers,axp209";
                                reg = <0x34>;
                                interrupt-parent = <&nmi_intc>;
-                               interrupts = <0 8>;
+                               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
                                interrupt-controller;
                                #interrupt-cells = <1>;
                        };

diff --git a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
index 275e49ffb78b7b2f44ab3510cc3e1292cbe4a616..06148b4d000fd275413a19703b8af8d2e24d5510 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
+++ b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
@@ -50,6 +50,7 @@
 #include "sunxi-common-regulators.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/pinctrl/sun4i-a10.h>
 
 / {
@@ -154,7 +155,7 @@
                                compatible = "x-powers,axp209";
                                reg = <0x34>;
                                interrupt-parent = <&nmi_intc>;
-                               interrupts = <0 8>;
+                               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
 
                                interrupt-controller;
                                #interrupt-cells = <1>;

diff --git a/arch/arm/boot/dts/sun7i-a20-m3.dts b/arch/arm/boot/dts/sun7i-a20-m3.dts
index 15be3ea800884cdd633017b182bae7f2d4110696..5add9f243ec392a03340b2ea4fbc4539904a2174 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-m3.dts
+++ b/arch/arm/boot/dts/sun7i-a20-m3.dts
@@ -52,6 +52,7 @@
 #include "sunxi-common-regulators.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/pinctrl/sun4i-a10.h>
 
 / {
@@ -130,7 +131,7 @@
                                compatible = "x-powers,axp209";
                                reg = <0x34>;
                                interrupt-parent = <&nmi_intc>;
-                               interrupts = <0 8>;
+                               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
 
                                interrupt-controller;
                                #interrupt-cells = <1>;

diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
index f74405cd18b6a827e3e16a9945a5bead52def849..12ded69d61ebc3cc9d8343450cc8f8d8c580244f 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
@@ -53,6 +53,7 @@
 #include "sunxi-common-regulators.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/pinctrl/sun4i-a10.h>
 
 / {
@@ -128,7 +129,7 @@
                                compatible = "x-powers,axp209";
                                reg = <0x34>;
                                interrupt-parent = <&nmi_intc>;
-                               interrupts = <0 8>;
+                               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
 
                                interrupt-controller;
                                #interrupt-cells = <1>;

diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
index 7176721f6c6b0953ad9f67055c8f09c3f36e88a1..260dbd3bf29d5fc71aa4b4a35eb73bda634f748e 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
@@ -50,6 +50,7 @@
 #include "sunxi-common-regulators.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/pinctrl/sun4i-a10.h>
 
 / {
@@ -125,7 +126,7 @@
                                compatible = "x-powers,axp209";
                                reg = <0x34>;
                                interrupt-parent = <&nmi_intc>;
-                               interrupts = <0 8>;
+                               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
 
                                interrupt-controller;
                                #interrupt-cells = <1>;

diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
index 63e4d54bdd0c9f5411a1608c9cbdf556450f9ff9..d0dcf72609717c8cdc52b1914d58d56784ef628d 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
@@ -17,6 +17,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/pinctrl/sun4i-a10.h>
 
 / {
@@ -185,7 +186,7 @@
                                compatible = "x-powers,axp209";
                                reg = <0x34>;
                                interrupt-parent = <&nmi_intc>;
-                               interrupts = <0 8>;
+                               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
 
                                interrupt-controller;
                                #interrupt-cells = <1>;

diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
index 0a668d9166c56d5f5d63396b66df49f6ef1baa70..0a2c2aeb4687ea999b7e0d7849efa0c755a5c7cb 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
+++ b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
@@ -52,6 +52,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/pinctrl/sun4i-a10.h>
 
 / {
@@ -137,7 +138,7 @@
                                compatible = "x-powers,axp209";
                                reg = <0x34>;
                                interrupt-parent = <&nmi_intc>;
-                               interrupts = <0 8>;
+                               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
 
                                interrupt-controller;
                                #interrupt-cells = <1>;