aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2014-12-16 16:59:59 -0500
committerMaxime Ripard <maxime.ripard@free-electrons.com>2015-01-21 03:58:57 -0500
commita6bac9ebf05a51d9c1c570e64a1df2e284b61818 (patch)
tree4126b511d8f42b1f1a49f55c215a05576fe9db6d /arch/arm/boot/dts
parent19882b84d7d9b1888b03f35b2430de550b61e49d (diff)
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>
Diffstat (limited to 'arch/arm/boot/dts')
-rw-r--r--arch/arm/boot/dts/sun7i-a20-bananapi.dts3
-rw-r--r--arch/arm/boot/dts/sun7i-a20-cubieboard2.dts3
-rw-r--r--arch/arm/boot/dts/sun7i-a20-cubietruck.dts3
-rw-r--r--arch/arm/boot/dts/sun7i-a20-hummingbird.dts3
-rw-r--r--arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts3
-rw-r--r--arch/arm/boot/dts/sun7i-a20-m3.dts3
-rw-r--r--arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts3
-rw-r--r--arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts3
-rw-r--r--arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts3
-rw-r--r--arch/arm/boot/dts/sun7i-a20-pcduino3.dts3
10 files changed, 20 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi.dts b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
index d5e5d39ff3c0..4b0cd776c5c5 100644
--- a/arch/arm/boot/dts/sun7i-a20-bananapi.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
@@ -52,6 +52,7 @@
52#include "sunxi-common-regulators.dtsi" 52#include "sunxi-common-regulators.dtsi"
53 53
54#include <dt-bindings/gpio/gpio.h> 54#include <dt-bindings/gpio/gpio.h>
55#include <dt-bindings/interrupt-controller/irq.h>
55#include <dt-bindings/pinctrl/sun4i-a10.h> 56#include <dt-bindings/pinctrl/sun4i-a10.h>
56 57
57/ { 58/ {
@@ -157,7 +158,7 @@
157 compatible = "x-powers,axp209"; 158 compatible = "x-powers,axp209";
158 reg = <0x34>; 159 reg = <0x34>;
159 interrupt-parent = <&nmi_intc>; 160 interrupt-parent = <&nmi_intc>;
160 interrupts = <0 8>; 161 interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
161 162
162 interrupt-controller; 163 interrupt-controller;
163 #interrupt-cells = <1>; 164 #interrupt-cells = <1>;
diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
index 9dc4c10f682e..18fc5db9c976 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
@@ -16,6 +16,7 @@
16#include "sunxi-common-regulators.dtsi" 16#include "sunxi-common-regulators.dtsi"
17 17
18#include <dt-bindings/gpio/gpio.h> 18#include <dt-bindings/gpio/gpio.h>
19#include <dt-bindings/interrupt-controller/irq.h>
19#include <dt-bindings/pinctrl/sun4i-a10.h> 20#include <dt-bindings/pinctrl/sun4i-a10.h>
20 21
21/ { 22/ {
@@ -90,7 +91,7 @@
90 compatible = "x-powers,axp209"; 91 compatible = "x-powers,axp209";
91 reg = <0x34>; 92 reg = <0x34>;
92 interrupt-parent = <&nmi_intc>; 93 interrupt-parent = <&nmi_intc>;
93 interrupts = <0 8>; 94 interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
94 95
95 interrupt-controller; 96 interrupt-controller;
96 #interrupt-cells = <1>; 97 #interrupt-cells = <1>;
diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
index 673846245cd9..77bc7e79cab9 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
@@ -16,6 +16,7 @@
16#include "sunxi-common-regulators.dtsi" 16#include "sunxi-common-regulators.dtsi"
17 17
18#include <dt-bindings/gpio/gpio.h> 18#include <dt-bindings/gpio/gpio.h>
19#include <dt-bindings/interrupt-controller/irq.h>
19#include <dt-bindings/pinctrl/sun4i-a10.h> 20#include <dt-bindings/pinctrl/sun4i-a10.h>
20 21
21/ { 22/ {
@@ -132,7 +133,7 @@
132 compatible = "x-powers,axp209"; 133 compatible = "x-powers,axp209";
133 reg = <0x34>; 134 reg = <0x34>;
134 interrupt-parent = <&nmi_intc>; 135 interrupt-parent = <&nmi_intc>;
135 interrupts = <0 8>; 136 interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
136 137
137 interrupt-controller; 138 interrupt-controller;
138 #interrupt-cells = <1>; 139 #interrupt-cells = <1>;
diff --git a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
index 4356a1709559..4d6a88ec8c0f 100644
--- a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
+++ b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
@@ -16,6 +16,7 @@
16#include "sunxi-common-regulators.dtsi" 16#include "sunxi-common-regulators.dtsi"
17 17
18#include <dt-bindings/gpio/gpio.h> 18#include <dt-bindings/gpio/gpio.h>
19#include <dt-bindings/interrupt-controller/irq.h>
19#include <dt-bindings/pinctrl/sun4i-a10.h> 20#include <dt-bindings/pinctrl/sun4i-a10.h>
20 21
21/ { 22/ {
@@ -150,7 +151,7 @@
150 compatible = "x-powers,axp209"; 151 compatible = "x-powers,axp209";
151 reg = <0x34>; 152 reg = <0x34>;
152 interrupt-parent = <&nmi_intc>; 153 interrupt-parent = <&nmi_intc>;
153 interrupts = <0 8>; 154 interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
154 interrupt-controller; 155 interrupt-controller;
155 #interrupt-cells = <1>; 156 #interrupt-cells = <1>;
156 }; 157 };
diff --git a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
index 275e49ffb78b..06148b4d000f 100644
--- a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
+++ b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
@@ -50,6 +50,7 @@
50#include "sunxi-common-regulators.dtsi" 50#include "sunxi-common-regulators.dtsi"
51 51
52#include <dt-bindings/gpio/gpio.h> 52#include <dt-bindings/gpio/gpio.h>
53#include <dt-bindings/interrupt-controller/irq.h>
53#include <dt-bindings/pinctrl/sun4i-a10.h> 54#include <dt-bindings/pinctrl/sun4i-a10.h>
54 55
55/ { 56/ {
@@ -154,7 +155,7 @@
154 compatible = "x-powers,axp209"; 155 compatible = "x-powers,axp209";
155 reg = <0x34>; 156 reg = <0x34>;
156 interrupt-parent = <&nmi_intc>; 157 interrupt-parent = <&nmi_intc>;
157 interrupts = <0 8>; 158 interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
158 159
159 interrupt-controller; 160 interrupt-controller;
160 #interrupt-cells = <1>; 161 #interrupt-cells = <1>;
diff --git a/arch/arm/boot/dts/sun7i-a20-m3.dts b/arch/arm/boot/dts/sun7i-a20-m3.dts
index 15be3ea80088..5add9f243ec3 100644
--- a/arch/arm/boot/dts/sun7i-a20-m3.dts
+++ b/arch/arm/boot/dts/sun7i-a20-m3.dts
@@ -52,6 +52,7 @@
52#include "sunxi-common-regulators.dtsi" 52#include "sunxi-common-regulators.dtsi"
53 53
54#include <dt-bindings/gpio/gpio.h> 54#include <dt-bindings/gpio/gpio.h>
55#include <dt-bindings/interrupt-controller/irq.h>
55#include <dt-bindings/pinctrl/sun4i-a10.h> 56#include <dt-bindings/pinctrl/sun4i-a10.h>
56 57
57/ { 58/ {
@@ -130,7 +131,7 @@
130 compatible = "x-powers,axp209"; 131 compatible = "x-powers,axp209";
131 reg = <0x34>; 132 reg = <0x34>;
132 interrupt-parent = <&nmi_intc>; 133 interrupt-parent = <&nmi_intc>;
133 interrupts = <0 8>; 134 interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
134 135
135 interrupt-controller; 136 interrupt-controller;
136 #interrupt-cells = <1>; 137 #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 f74405cd18b6..12ded69d61eb 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
@@ -53,6 +53,7 @@
53#include "sunxi-common-regulators.dtsi" 53#include "sunxi-common-regulators.dtsi"
54 54
55#include <dt-bindings/gpio/gpio.h> 55#include <dt-bindings/gpio/gpio.h>
56#include <dt-bindings/interrupt-controller/irq.h>
56#include <dt-bindings/pinctrl/sun4i-a10.h> 57#include <dt-bindings/pinctrl/sun4i-a10.h>
57 58
58/ { 59/ {
@@ -128,7 +129,7 @@
128 compatible = "x-powers,axp209"; 129 compatible = "x-powers,axp209";
129 reg = <0x34>; 130 reg = <0x34>;
130 interrupt-parent = <&nmi_intc>; 131 interrupt-parent = <&nmi_intc>;
131 interrupts = <0 8>; 132 interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
132 133
133 interrupt-controller; 134 interrupt-controller;
134 #interrupt-cells = <1>; 135 #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 7176721f6c6b..260dbd3bf29d 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
@@ -50,6 +50,7 @@
50#include "sunxi-common-regulators.dtsi" 50#include "sunxi-common-regulators.dtsi"
51 51
52#include <dt-bindings/gpio/gpio.h> 52#include <dt-bindings/gpio/gpio.h>
53#include <dt-bindings/interrupt-controller/irq.h>
53#include <dt-bindings/pinctrl/sun4i-a10.h> 54#include <dt-bindings/pinctrl/sun4i-a10.h>
54 55
55/ { 56/ {
@@ -125,7 +126,7 @@
125 compatible = "x-powers,axp209"; 126 compatible = "x-powers,axp209";
126 reg = <0x34>; 127 reg = <0x34>;
127 interrupt-parent = <&nmi_intc>; 128 interrupt-parent = <&nmi_intc>;
128 interrupts = <0 8>; 129 interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
129 130
130 interrupt-controller; 131 interrupt-controller;
131 #interrupt-cells = <1>; 132 #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 63e4d54bdd0c..d0dcf7260971 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
@@ -17,6 +17,7 @@
17 17
18#include <dt-bindings/gpio/gpio.h> 18#include <dt-bindings/gpio/gpio.h>
19#include <dt-bindings/input/input.h> 19#include <dt-bindings/input/input.h>
20#include <dt-bindings/interrupt-controller/irq.h>
20#include <dt-bindings/pinctrl/sun4i-a10.h> 21#include <dt-bindings/pinctrl/sun4i-a10.h>
21 22
22/ { 23/ {
@@ -185,7 +186,7 @@
185 compatible = "x-powers,axp209"; 186 compatible = "x-powers,axp209";
186 reg = <0x34>; 187 reg = <0x34>;
187 interrupt-parent = <&nmi_intc>; 188 interrupt-parent = <&nmi_intc>;
188 interrupts = <0 8>; 189 interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
189 190
190 interrupt-controller; 191 interrupt-controller;
191 #interrupt-cells = <1>; 192 #interrupt-cells = <1>;
diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
index 0a668d9166c5..0a2c2aeb4687 100644
--- a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
+++ b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
@@ -52,6 +52,7 @@
52 52
53#include <dt-bindings/gpio/gpio.h> 53#include <dt-bindings/gpio/gpio.h>
54#include <dt-bindings/input/input.h> 54#include <dt-bindings/input/input.h>
55#include <dt-bindings/interrupt-controller/irq.h>
55#include <dt-bindings/pinctrl/sun4i-a10.h> 56#include <dt-bindings/pinctrl/sun4i-a10.h>
56 57
57/ { 58/ {
@@ -137,7 +138,7 @@
137 compatible = "x-powers,axp209"; 138 compatible = "x-powers,axp209";
138 reg = <0x34>; 139 reg = <0x34>;
139 interrupt-parent = <&nmi_intc>; 140 interrupt-parent = <&nmi_intc>;
140 interrupts = <0 8>; 141 interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
141 142
142 interrupt-controller; 143 interrupt-controller;
143 #interrupt-cells = <1>; 144 #interrupt-cells = <1>;
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-23 21:21:42 -0500