diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2014-04-29 20:41:28 -0400 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2014-05-12 21:13:19 -0400 |
commit | 9ff254adc1e32db46000a33b8ecbc4d7047672be (patch) | |
tree | aa118a3a880fd5c1e93739fe80e05bac11c37bf8 /arch/arm/boot/dts/r8a7778.dtsi | |
parent | 15d89dc9bfde872885c6226d86fb25676cbedfb3 (diff) |
ARM: shmobile: dts: Move interrupt-parent property to root node
There's no need to duplicate the interrupt-parent property in all DT
nodes as the kernel automatically walks parent nodes to find the
property. Specify it once in the root node only.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.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 | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi index 3c6fab5c9702..3af0a2187493 100644 --- a/arch/arm/boot/dts/r8a7778.dtsi +++ b/arch/arm/boot/dts/r8a7778.dtsi | |||
@@ -20,6 +20,7 @@ | |||
20 | 20 | ||
21 | / { | 21 | / { |
22 | compatible = "renesas,r8a7778"; | 22 | compatible = "renesas,r8a7778"; |
23 | interrupt-parent = <&gic>; | ||
23 | 24 | ||
24 | cpus { | 25 | cpus { |
25 | cpu@0 { | 26 | cpu@0 { |
@@ -52,7 +53,6 @@ | |||
52 | <0xfe780024 4>, | 53 | <0xfe780024 4>, |
53 | <0xfe780044 4>, | 54 | <0xfe780044 4>, |
54 | <0xfe780064 4>; | 55 | <0xfe780064 4>; |
55 | interrupt-parent = <&gic>; | ||
56 | interrupts = <0 27 IRQ_TYPE_LEVEL_HIGH | 56 | interrupts = <0 27 IRQ_TYPE_LEVEL_HIGH |
57 | 0 28 IRQ_TYPE_LEVEL_HIGH | 57 | 0 28 IRQ_TYPE_LEVEL_HIGH |
58 | 0 29 IRQ_TYPE_LEVEL_HIGH | 58 | 0 29 IRQ_TYPE_LEVEL_HIGH |
@@ -63,7 +63,6 @@ | |||
63 | gpio0: gpio@ffc40000 { | 63 | gpio0: gpio@ffc40000 { |
64 | compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; | 64 | compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; |
65 | reg = <0xffc40000 0x2c>; | 65 | reg = <0xffc40000 0x2c>; |
66 | interrupt-parent = <&gic>; | ||
67 | interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>; | 66 | interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>; |
68 | #gpio-cells = <2>; | 67 | #gpio-cells = <2>; |
69 | gpio-controller; | 68 | gpio-controller; |
@@ -75,7 +74,6 @@ | |||
75 | gpio1: gpio@ffc41000 { | 74 | gpio1: gpio@ffc41000 { |
76 | compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; | 75 | compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; |
77 | reg = <0xffc41000 0x2c>; | 76 | reg = <0xffc41000 0x2c>; |
78 | interrupt-parent = <&gic>; | ||
79 | interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>; | 77 | interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>; |
80 | #gpio-cells = <2>; | 78 | #gpio-cells = <2>; |
81 | gpio-controller; | 79 | gpio-controller; |
@@ -87,7 +85,6 @@ | |||
87 | gpio2: gpio@ffc42000 { | 85 | gpio2: gpio@ffc42000 { |
88 | compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; | 86 | compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; |
89 | reg = <0xffc42000 0x2c>; | 87 | reg = <0xffc42000 0x2c>; |
90 | interrupt-parent = <&gic>; | ||
91 | interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>; | 88 | interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>; |
92 | #gpio-cells = <2>; | 89 | #gpio-cells = <2>; |
93 | gpio-controller; | 90 | gpio-controller; |
@@ -99,7 +96,6 @@ | |||
99 | gpio3: gpio@ffc43000 { | 96 | gpio3: gpio@ffc43000 { |
100 | compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; | 97 | compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; |
101 | reg = <0xffc43000 0x2c>; | 98 | reg = <0xffc43000 0x2c>; |
102 | interrupt-parent = <&gic>; | ||
103 | interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>; | 99 | interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>; |
104 | #gpio-cells = <2>; | 100 | #gpio-cells = <2>; |
105 | gpio-controller; | 101 | gpio-controller; |
@@ -111,7 +107,6 @@ | |||
111 | gpio4: gpio@ffc44000 { | 107 | gpio4: gpio@ffc44000 { |
112 | compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; | 108 | compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; |
113 | reg = <0xffc44000 0x2c>; | 109 | reg = <0xffc44000 0x2c>; |
114 | interrupt-parent = <&gic>; | ||
115 | interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>; | 110 | interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>; |
116 | #gpio-cells = <2>; | 111 | #gpio-cells = <2>; |
117 | gpio-controller; | 112 | gpio-controller; |
@@ -130,7 +125,6 @@ | |||
130 | #size-cells = <0>; | 125 | #size-cells = <0>; |
131 | compatible = "renesas,i2c-r8a7778"; | 126 | compatible = "renesas,i2c-r8a7778"; |
132 | reg = <0xffc70000 0x1000>; | 127 | reg = <0xffc70000 0x1000>; |
133 | interrupt-parent = <&gic>; | ||
134 | interrupts = <0 67 IRQ_TYPE_LEVEL_HIGH>; | 128 | interrupts = <0 67 IRQ_TYPE_LEVEL_HIGH>; |
135 | status = "disabled"; | 129 | status = "disabled"; |
136 | }; | 130 | }; |
@@ -140,7 +134,6 @@ | |||
140 | #size-cells = <0>; | 134 | #size-cells = <0>; |
141 | compatible = "renesas,i2c-r8a7778"; | 135 | compatible = "renesas,i2c-r8a7778"; |
142 | reg = <0xffc71000 0x1000>; | 136 | reg = <0xffc71000 0x1000>; |
143 | interrupt-parent = <&gic>; | ||
144 | interrupts = <0 78 IRQ_TYPE_LEVEL_HIGH>; | 137 | interrupts = <0 78 IRQ_TYPE_LEVEL_HIGH>; |
145 | status = "disabled"; | 138 | status = "disabled"; |
146 | }; | 139 | }; |
@@ -150,7 +143,6 @@ | |||
150 | #size-cells = <0>; | 143 | #size-cells = <0>; |
151 | compatible = "renesas,i2c-r8a7778"; | 144 | compatible = "renesas,i2c-r8a7778"; |
152 | reg = <0xffc72000 0x1000>; | 145 | reg = <0xffc72000 0x1000>; |
153 | interrupt-parent = <&gic>; | ||
154 | interrupts = <0 76 IRQ_TYPE_LEVEL_HIGH>; | 146 | interrupts = <0 76 IRQ_TYPE_LEVEL_HIGH>; |
155 | status = "disabled"; | 147 | status = "disabled"; |
156 | }; | 148 | }; |
@@ -160,7 +152,6 @@ | |||
160 | #size-cells = <0>; | 152 | #size-cells = <0>; |
161 | compatible = "renesas,i2c-r8a7778"; | 153 | compatible = "renesas,i2c-r8a7778"; |
162 | reg = <0xffc73000 0x1000>; | 154 | reg = <0xffc73000 0x1000>; |
163 | interrupt-parent = <&gic>; | ||
164 | interrupts = <0 77 IRQ_TYPE_LEVEL_HIGH>; | 155 | interrupts = <0 77 IRQ_TYPE_LEVEL_HIGH>; |
165 | status = "disabled"; | 156 | status = "disabled"; |
166 | }; | 157 | }; |
@@ -168,7 +159,6 @@ | |||
168 | mmcif: mmc@ffe4e000 { | 159 | mmcif: mmc@ffe4e000 { |
169 | compatible = "renesas,sh-mmcif"; | 160 | compatible = "renesas,sh-mmcif"; |
170 | reg = <0xffe4e000 0x100>; | 161 | reg = <0xffe4e000 0x100>; |
171 | interrupt-parent = <&gic>; | ||
172 | interrupts = <0 61 IRQ_TYPE_LEVEL_HIGH>; | 162 | interrupts = <0 61 IRQ_TYPE_LEVEL_HIGH>; |
173 | status = "disabled"; | 163 | status = "disabled"; |
174 | }; | 164 | }; |
@@ -176,7 +166,6 @@ | |||
176 | sdhi0: sd@ffe4c000 { | 166 | sdhi0: sd@ffe4c000 { |
177 | compatible = "renesas,sdhi-r8a7778"; | 167 | compatible = "renesas,sdhi-r8a7778"; |
178 | reg = <0xffe4c000 0x100>; | 168 | reg = <0xffe4c000 0x100>; |
179 | interrupt-parent = <&gic>; | ||
180 | interrupts = <0 87 IRQ_TYPE_LEVEL_HIGH>; | 169 | interrupts = <0 87 IRQ_TYPE_LEVEL_HIGH>; |
181 | cap-sd-highspeed; | 170 | cap-sd-highspeed; |
182 | cap-sdio-irq; | 171 | cap-sdio-irq; |
@@ -186,7 +175,6 @@ | |||
186 | sdhi1: sd@ffe4d000 { | 175 | sdhi1: sd@ffe4d000 { |
187 | compatible = "renesas,sdhi-r8a7778"; | 176 | compatible = "renesas,sdhi-r8a7778"; |
188 | reg = <0xffe4d000 0x100>; | 177 | reg = <0xffe4d000 0x100>; |
189 | interrupt-parent = <&gic>; | ||
190 | interrupts = <0 88 IRQ_TYPE_LEVEL_HIGH>; | 178 | interrupts = <0 88 IRQ_TYPE_LEVEL_HIGH>; |
191 | cap-sd-highspeed; | 179 | cap-sd-highspeed; |
192 | cap-sdio-irq; | 180 | cap-sdio-irq; |
@@ -196,7 +184,6 @@ | |||
196 | sdhi2: sd@ffe4f000 { | 184 | sdhi2: sd@ffe4f000 { |
197 | compatible = "renesas,sdhi-r8a7778"; | 185 | compatible = "renesas,sdhi-r8a7778"; |
198 | reg = <0xffe4f000 0x100>; | 186 | reg = <0xffe4f000 0x100>; |
199 | interrupt-parent = <&gic>; | ||
200 | interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>; | 187 | interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>; |
201 | cap-sd-highspeed; | 188 | cap-sd-highspeed; |
202 | cap-sdio-irq; | 189 | cap-sdio-irq; |
@@ -206,7 +193,6 @@ | |||
206 | hspi0: spi@fffc7000 { | 193 | hspi0: spi@fffc7000 { |
207 | compatible = "renesas,hspi-r8a7778", "renesas,hspi"; | 194 | compatible = "renesas,hspi-r8a7778", "renesas,hspi"; |
208 | reg = <0xfffc7000 0x18>; | 195 | reg = <0xfffc7000 0x18>; |
209 | interrupt-parent = <&gic>; | ||
210 | interrupts = <0 63 IRQ_TYPE_LEVEL_HIGH>; | 196 | interrupts = <0 63 IRQ_TYPE_LEVEL_HIGH>; |
211 | #address-cells = <1>; | 197 | #address-cells = <1>; |
212 | #size-cells = <0>; | 198 | #size-cells = <0>; |
@@ -216,7 +202,6 @@ | |||
216 | hspi1: spi@fffc8000 { | 202 | hspi1: spi@fffc8000 { |
217 | compatible = "renesas,hspi-r8a7778", "renesas,hspi"; | 203 | compatible = "renesas,hspi-r8a7778", "renesas,hspi"; |
218 | reg = <0xfffc8000 0x18>; | 204 | reg = <0xfffc8000 0x18>; |
219 | interrupt-parent = <&gic>; | ||
220 | interrupts = <0 84 IRQ_TYPE_LEVEL_HIGH>; | 205 | interrupts = <0 84 IRQ_TYPE_LEVEL_HIGH>; |
221 | #address-cells = <1>; | 206 | #address-cells = <1>; |
222 | #size-cells = <0>; | 207 | #size-cells = <0>; |
@@ -226,7 +211,6 @@ | |||
226 | hspi2: spi@fffc6000 { | 211 | hspi2: spi@fffc6000 { |
227 | compatible = "renesas,hspi-r8a7778", "renesas,hspi"; | 212 | compatible = "renesas,hspi-r8a7778", "renesas,hspi"; |
228 | reg = <0xfffc6000 0x18>; | 213 | reg = <0xfffc6000 0x18>; |
229 | interrupt-parent = <&gic>; | ||
230 | interrupts = <0 85 IRQ_TYPE_LEVEL_HIGH>; | 214 | interrupts = <0 85 IRQ_TYPE_LEVEL_HIGH>; |
231 | #address-cells = <1>; | 215 | #address-cells = <1>; |
232 | #size-cells = <0>; | 216 | #size-cells = <0>; |