diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-11-18 21:18:25 -0500 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-12-10 03:27:07 -0500 |
commit | 5f75e73c376c247a2c7bbe6f3fa3901b2d8f1a9c (patch) | |
tree | 442757dadcd8e07c5e578a438bda15951a5c3b31 /arch/arm/boot/dts/r8a7778.dtsi | |
parent | 31c46cbf5b8bab87e89028977521c84f2d871040 (diff) |
ARM: shmobile: Use interrupt macros in SoC DT files
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/boot/dts/r8a7778.dtsi')
-rw-r--r-- | arch/arm/boot/dts/r8a7778.dtsi | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi index 819b1942aa14..3314e0aeccf5 100644 --- a/arch/arm/boot/dts/r8a7778.dtsi +++ b/arch/arm/boot/dts/r8a7778.dtsi | |||
@@ -16,6 +16,8 @@ | |||
16 | 16 | ||
17 | /include/ "skeleton.dtsi" | 17 | /include/ "skeleton.dtsi" |
18 | 18 | ||
19 | #include <dt-bindings/interrupt-controller/irq.h> | ||
20 | |||
19 | / { | 21 | / { |
20 | compatible = "renesas,r8a7778"; | 22 | compatible = "renesas,r8a7778"; |
21 | 23 | ||
@@ -51,10 +53,10 @@ | |||
51 | <0xfe780044 4>, | 53 | <0xfe780044 4>, |
52 | <0xfe780064 4>; | 54 | <0xfe780064 4>; |
53 | interrupt-parent = <&gic>; | 55 | interrupt-parent = <&gic>; |
54 | interrupts = <0 27 0x4 | 56 | interrupts = <0 27 IRQ_TYPE_LEVEL_HIGH |
55 | 0 28 0x4 | 57 | 0 28 IRQ_TYPE_LEVEL_HIGH |
56 | 0 29 0x4 | 58 | 0 29 IRQ_TYPE_LEVEL_HIGH |
57 | 0 30 0x4>; | 59 | 0 30 IRQ_TYPE_LEVEL_HIGH>; |
58 | sense-bitfield-width = <2>; | 60 | sense-bitfield-width = <2>; |
59 | }; | 61 | }; |
60 | 62 | ||
@@ -62,7 +64,7 @@ | |||
62 | compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; | 64 | compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; |
63 | reg = <0xffc40000 0x2c>; | 65 | reg = <0xffc40000 0x2c>; |
64 | interrupt-parent = <&gic>; | 66 | interrupt-parent = <&gic>; |
65 | interrupts = <0 103 0x4>; | 67 | interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>; |
66 | #gpio-cells = <2>; | 68 | #gpio-cells = <2>; |
67 | gpio-controller; | 69 | gpio-controller; |
68 | gpio-ranges = <&pfc 0 0 32>; | 70 | gpio-ranges = <&pfc 0 0 32>; |
@@ -74,7 +76,7 @@ | |||
74 | compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; | 76 | compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; |
75 | reg = <0xffc41000 0x2c>; | 77 | reg = <0xffc41000 0x2c>; |
76 | interrupt-parent = <&gic>; | 78 | interrupt-parent = <&gic>; |
77 | interrupts = <0 103 0x4>; | 79 | interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>; |
78 | #gpio-cells = <2>; | 80 | #gpio-cells = <2>; |
79 | gpio-controller; | 81 | gpio-controller; |
80 | gpio-ranges = <&pfc 0 32 32>; | 82 | gpio-ranges = <&pfc 0 32 32>; |
@@ -86,7 +88,7 @@ | |||
86 | compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; | 88 | compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; |
87 | reg = <0xffc42000 0x2c>; | 89 | reg = <0xffc42000 0x2c>; |
88 | interrupt-parent = <&gic>; | 90 | interrupt-parent = <&gic>; |
89 | interrupts = <0 103 0x4>; | 91 | interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>; |
90 | #gpio-cells = <2>; | 92 | #gpio-cells = <2>; |
91 | gpio-controller; | 93 | gpio-controller; |
92 | gpio-ranges = <&pfc 0 64 32>; | 94 | gpio-ranges = <&pfc 0 64 32>; |
@@ -98,7 +100,7 @@ | |||
98 | compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; | 100 | compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; |
99 | reg = <0xffc43000 0x2c>; | 101 | reg = <0xffc43000 0x2c>; |
100 | interrupt-parent = <&gic>; | 102 | interrupt-parent = <&gic>; |
101 | interrupts = <0 103 0x4>; | 103 | interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>; |
102 | #gpio-cells = <2>; | 104 | #gpio-cells = <2>; |
103 | gpio-controller; | 105 | gpio-controller; |
104 | gpio-ranges = <&pfc 0 96 32>; | 106 | gpio-ranges = <&pfc 0 96 32>; |
@@ -110,7 +112,7 @@ | |||
110 | compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; | 112 | compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; |
111 | reg = <0xffc44000 0x2c>; | 113 | reg = <0xffc44000 0x2c>; |
112 | interrupt-parent = <&gic>; | 114 | interrupt-parent = <&gic>; |
113 | interrupts = <0 103 0x4>; | 115 | interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>; |
114 | #gpio-cells = <2>; | 116 | #gpio-cells = <2>; |
115 | gpio-controller; | 117 | gpio-controller; |
116 | gpio-ranges = <&pfc 0 128 27>; | 118 | gpio-ranges = <&pfc 0 128 27>; |
@@ -129,7 +131,7 @@ | |||
129 | compatible = "renesas,i2c-r8a7778"; | 131 | compatible = "renesas,i2c-r8a7778"; |
130 | reg = <0xffc70000 0x1000>; | 132 | reg = <0xffc70000 0x1000>; |
131 | interrupt-parent = <&gic>; | 133 | interrupt-parent = <&gic>; |
132 | interrupts = <0 67 0x4>; | 134 | interrupts = <0 67 IRQ_TYPE_LEVEL_HIGH>; |
133 | status = "disabled"; | 135 | status = "disabled"; |
134 | }; | 136 | }; |
135 | 137 | ||
@@ -139,7 +141,7 @@ | |||
139 | compatible = "renesas,i2c-r8a7778"; | 141 | compatible = "renesas,i2c-r8a7778"; |
140 | reg = <0xffc71000 0x1000>; | 142 | reg = <0xffc71000 0x1000>; |
141 | interrupt-parent = <&gic>; | 143 | interrupt-parent = <&gic>; |
142 | interrupts = <0 78 0x4>; | 144 | interrupts = <0 78 IRQ_TYPE_LEVEL_HIGH>; |
143 | status = "disabled"; | 145 | status = "disabled"; |
144 | }; | 146 | }; |
145 | 147 | ||
@@ -149,7 +151,7 @@ | |||
149 | compatible = "renesas,i2c-r8a7778"; | 151 | compatible = "renesas,i2c-r8a7778"; |
150 | reg = <0xffc72000 0x1000>; | 152 | reg = <0xffc72000 0x1000>; |
151 | interrupt-parent = <&gic>; | 153 | interrupt-parent = <&gic>; |
152 | interrupts = <0 76 0x4>; | 154 | interrupts = <0 76 IRQ_TYPE_LEVEL_HIGH>; |
153 | status = "disabled"; | 155 | status = "disabled"; |
154 | }; | 156 | }; |
155 | 157 | ||
@@ -159,7 +161,7 @@ | |||
159 | compatible = "renesas,i2c-r8a7778"; | 161 | compatible = "renesas,i2c-r8a7778"; |
160 | reg = <0xffc73000 0x1000>; | 162 | reg = <0xffc73000 0x1000>; |
161 | interrupt-parent = <&gic>; | 163 | interrupt-parent = <&gic>; |
162 | interrupts = <0 77 0x4>; | 164 | interrupts = <0 77 IRQ_TYPE_LEVEL_HIGH>; |
163 | status = "disabled"; | 165 | status = "disabled"; |
164 | }; | 166 | }; |
165 | 167 | ||
@@ -167,7 +169,7 @@ | |||
167 | compatible = "renesas,sh-mmcif"; | 169 | compatible = "renesas,sh-mmcif"; |
168 | reg = <0xffe4e000 0x100>; | 170 | reg = <0xffe4e000 0x100>; |
169 | interrupt-parent = <&gic>; | 171 | interrupt-parent = <&gic>; |
170 | interrupts = <0 61 4>; | 172 | interrupts = <0 61 IRQ_TYPE_LEVEL_HIGH>; |
171 | status = "disabled"; | 173 | status = "disabled"; |
172 | }; | 174 | }; |
173 | 175 | ||
@@ -175,7 +177,7 @@ | |||
175 | compatible = "renesas,sdhi-r8a7778"; | 177 | compatible = "renesas,sdhi-r8a7778"; |
176 | reg = <0xffe4c000 0x100>; | 178 | reg = <0xffe4c000 0x100>; |
177 | interrupt-parent = <&gic>; | 179 | interrupt-parent = <&gic>; |
178 | interrupts = <0 87 4>; | 180 | interrupts = <0 87 IRQ_TYPE_LEVEL_HIGH>; |
179 | cap-sd-highspeed; | 181 | cap-sd-highspeed; |
180 | cap-sdio-irq; | 182 | cap-sdio-irq; |
181 | status = "disabled"; | 183 | status = "disabled"; |
@@ -185,7 +187,7 @@ | |||
185 | compatible = "renesas,sdhi-r8a7778"; | 187 | compatible = "renesas,sdhi-r8a7778"; |
186 | reg = <0xffe4d000 0x100>; | 188 | reg = <0xffe4d000 0x100>; |
187 | interrupt-parent = <&gic>; | 189 | interrupt-parent = <&gic>; |
188 | interrupts = <0 88 4>; | 190 | interrupts = <0 88 IRQ_TYPE_LEVEL_HIGH>; |
189 | cap-sd-highspeed; | 191 | cap-sd-highspeed; |
190 | cap-sdio-irq; | 192 | cap-sdio-irq; |
191 | status = "disabled"; | 193 | status = "disabled"; |
@@ -195,7 +197,7 @@ | |||
195 | compatible = "renesas,sdhi-r8a7778"; | 197 | compatible = "renesas,sdhi-r8a7778"; |
196 | reg = <0xffe4f000 0x100>; | 198 | reg = <0xffe4f000 0x100>; |
197 | interrupt-parent = <&gic>; | 199 | interrupt-parent = <&gic>; |
198 | interrupts = <0 86 4>; | 200 | interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>; |
199 | cap-sd-highspeed; | 201 | cap-sd-highspeed; |
200 | cap-sdio-irq; | 202 | cap-sdio-irq; |
201 | status = "disabled"; | 203 | status = "disabled"; |
@@ -207,7 +209,7 @@ | |||
207 | compatible = "renesas,i2c-r8a7778"; | 209 | compatible = "renesas,i2c-r8a7778"; |
208 | reg = <0xffc70000 0x1000>; | 210 | reg = <0xffc70000 0x1000>; |
209 | interrupt-parent = <&gic>; | 211 | interrupt-parent = <&gic>; |
210 | interrupts = <0 67 0x4>; | 212 | interrupts = <0 67 IRQ_TYPE_LEVEL_HIGH>; |
211 | status = "disabled"; | 213 | status = "disabled"; |
212 | }; | 214 | }; |
213 | 215 | ||
@@ -217,7 +219,7 @@ | |||
217 | compatible = "renesas,i2c-r8a7778"; | 219 | compatible = "renesas,i2c-r8a7778"; |
218 | reg = <0xffc71000 0x1000>; | 220 | reg = <0xffc71000 0x1000>; |
219 | interrupt-parent = <&gic>; | 221 | interrupt-parent = <&gic>; |
220 | interrupts = <0 78 0x4>; | 222 | interrupts = <0 78 IRQ_TYPE_LEVEL_HIGH>; |
221 | status = "disabled"; | 223 | status = "disabled"; |
222 | }; | 224 | }; |
223 | 225 | ||
@@ -227,7 +229,7 @@ | |||
227 | compatible = "renesas,i2c-r8a7778"; | 229 | compatible = "renesas,i2c-r8a7778"; |
228 | reg = <0xffc72000 0x1000>; | 230 | reg = <0xffc72000 0x1000>; |
229 | interrupt-parent = <&gic>; | 231 | interrupt-parent = <&gic>; |
230 | interrupts = <0 76 0x4>; | 232 | interrupts = <0 76 IRQ_TYPE_LEVEL_HIGH>; |
231 | status = "disabled"; | 233 | status = "disabled"; |
232 | }; | 234 | }; |
233 | 235 | ||
@@ -237,7 +239,7 @@ | |||
237 | compatible = "renesas,i2c-r8a7778"; | 239 | compatible = "renesas,i2c-r8a7778"; |
238 | reg = <0xffc73000 0x1000>; | 240 | reg = <0xffc73000 0x1000>; |
239 | interrupt-parent = <&gic>; | 241 | interrupt-parent = <&gic>; |
240 | interrupts = <0 77 0x4>; | 242 | interrupts = <0 77 IRQ_TYPE_LEVEL_HIGH>; |
241 | status = "disabled"; | 243 | status = "disabled"; |
242 | }; | 244 | }; |
243 | 245 | ||