diff options
-rw-r--r-- | Documentation/powerpc/booting-without-of.txt | 6 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc7448hpc2.dts | 2 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8540ads.dts | 2 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8541cds.dts | 2 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8544ds.dts | 2 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8548cds.dts | 2 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8555cds.dts | 2 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8560ads.dts | 1 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8568mds.dts | 2 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8572ds.dts | 2 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8610_hpcd.dts | 2 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8641_hpcn.dts | 2 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/sbc8548.dts | 2 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/sbc8560.dts | 2 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/storcenter.dts | 1 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/stx_gp3_8560.dts | 1 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/tqm8540.dts | 1 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/tqm8541.dts | 1 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/tqm8555.dts | 1 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/tqm8560.dts | 1 |
20 files changed, 8 insertions, 29 deletions
diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt index c67d2f589754..948f6417a40b 100644 --- a/Documentation/powerpc/booting-without-of.txt +++ b/Documentation/powerpc/booting-without-of.txt | |||
@@ -1363,14 +1363,11 @@ platforms are moved over to use the flattened-device-tree model. | |||
1363 | 1363 | ||
1364 | pic@40000 { | 1364 | pic@40000 { |
1365 | linux,phandle = <40000>; | 1365 | linux,phandle = <40000>; |
1366 | clock-frequency = <0>; | ||
1367 | interrupt-controller; | 1366 | interrupt-controller; |
1368 | #address-cells = <0>; | 1367 | #address-cells = <0>; |
1369 | reg = <40000 40000>; | 1368 | reg = <40000 40000>; |
1370 | built-in; | ||
1371 | compatible = "chrp,open-pic"; | 1369 | compatible = "chrp,open-pic"; |
1372 | device_type = "open-pic"; | 1370 | device_type = "open-pic"; |
1373 | big-endian; | ||
1374 | }; | 1371 | }; |
1375 | 1372 | ||
1376 | 1373 | ||
@@ -3663,14 +3660,11 @@ not necessary as they are usually the same as the root node. | |||
3663 | 3660 | ||
3664 | pic@40000 { | 3661 | pic@40000 { |
3665 | linux,phandle = <40000>; | 3662 | linux,phandle = <40000>; |
3666 | clock-frequency = <0>; | ||
3667 | interrupt-controller; | 3663 | interrupt-controller; |
3668 | #address-cells = <0>; | 3664 | #address-cells = <0>; |
3669 | reg = <40000 40000>; | 3665 | reg = <40000 40000>; |
3670 | built-in; | ||
3671 | compatible = "chrp,open-pic"; | 3666 | compatible = "chrp,open-pic"; |
3672 | device_type = "open-pic"; | 3667 | device_type = "open-pic"; |
3673 | big-endian; | ||
3674 | }; | 3668 | }; |
3675 | 3669 | ||
3676 | i2c@3000 { | 3670 | i2c@3000 { |
diff --git a/arch/powerpc/boot/dts/mpc7448hpc2.dts b/arch/powerpc/boot/dts/mpc7448hpc2.dts index 4936349b87cd..705c23c14f32 100644 --- a/arch/powerpc/boot/dts/mpc7448hpc2.dts +++ b/arch/powerpc/boot/dts/mpc7448hpc2.dts | |||
@@ -124,14 +124,12 @@ | |||
124 | }; | 124 | }; |
125 | 125 | ||
126 | mpic: pic@7400 { | 126 | mpic: pic@7400 { |
127 | clock-frequency = <0>; | ||
128 | interrupt-controller; | 127 | interrupt-controller; |
129 | #address-cells = <0>; | 128 | #address-cells = <0>; |
130 | #interrupt-cells = <2>; | 129 | #interrupt-cells = <2>; |
131 | reg = <0x7400 0x400>; | 130 | reg = <0x7400 0x400>; |
132 | compatible = "chrp,open-pic"; | 131 | compatible = "chrp,open-pic"; |
133 | device_type = "open-pic"; | 132 | device_type = "open-pic"; |
134 | big-endian; | ||
135 | }; | 133 | }; |
136 | pci@1000 { | 134 | pci@1000 { |
137 | compatible = "tsi108-pci"; | 135 | compatible = "tsi108-pci"; |
diff --git a/arch/powerpc/boot/dts/mpc8540ads.dts b/arch/powerpc/boot/dts/mpc8540ads.dts index 18033ed0b535..58e165e87373 100644 --- a/arch/powerpc/boot/dts/mpc8540ads.dts +++ b/arch/powerpc/boot/dts/mpc8540ads.dts | |||
@@ -165,14 +165,12 @@ | |||
165 | interrupt-parent = <&mpic>; | 165 | interrupt-parent = <&mpic>; |
166 | }; | 166 | }; |
167 | mpic: pic@40000 { | 167 | mpic: pic@40000 { |
168 | clock-frequency = <0>; | ||
169 | interrupt-controller; | 168 | interrupt-controller; |
170 | #address-cells = <0>; | 169 | #address-cells = <0>; |
171 | #interrupt-cells = <2>; | 170 | #interrupt-cells = <2>; |
172 | reg = <0x40000 0x40000>; | 171 | reg = <0x40000 0x40000>; |
173 | compatible = "chrp,open-pic"; | 172 | compatible = "chrp,open-pic"; |
174 | device_type = "open-pic"; | 173 | device_type = "open-pic"; |
175 | big-endian; | ||
176 | }; | 174 | }; |
177 | }; | 175 | }; |
178 | 176 | ||
diff --git a/arch/powerpc/boot/dts/mpc8541cds.dts b/arch/powerpc/boot/dts/mpc8541cds.dts index 663c7c50ca45..21ebe7cc454a 100644 --- a/arch/powerpc/boot/dts/mpc8541cds.dts +++ b/arch/powerpc/boot/dts/mpc8541cds.dts | |||
@@ -148,14 +148,12 @@ | |||
148 | }; | 148 | }; |
149 | 149 | ||
150 | mpic: pic@40000 { | 150 | mpic: pic@40000 { |
151 | clock-frequency = <0>; | ||
152 | interrupt-controller; | 151 | interrupt-controller; |
153 | #address-cells = <0>; | 152 | #address-cells = <0>; |
154 | #interrupt-cells = <2>; | 153 | #interrupt-cells = <2>; |
155 | reg = <0x40000 0x40000>; | 154 | reg = <0x40000 0x40000>; |
156 | compatible = "chrp,open-pic"; | 155 | compatible = "chrp,open-pic"; |
157 | device_type = "open-pic"; | 156 | device_type = "open-pic"; |
158 | big-endian; | ||
159 | }; | 157 | }; |
160 | 158 | ||
161 | cpm@919c0 { | 159 | cpm@919c0 { |
diff --git a/arch/powerpc/boot/dts/mpc8544ds.dts b/arch/powerpc/boot/dts/mpc8544ds.dts index 1cfd97078170..921f9f6848ea 100644 --- a/arch/powerpc/boot/dts/mpc8544ds.dts +++ b/arch/powerpc/boot/dts/mpc8544ds.dts | |||
@@ -210,14 +210,12 @@ | |||
210 | }; | 210 | }; |
211 | 211 | ||
212 | mpic: pic@40000 { | 212 | mpic: pic@40000 { |
213 | clock-frequency = <0>; | ||
214 | interrupt-controller; | 213 | interrupt-controller; |
215 | #address-cells = <0>; | 214 | #address-cells = <0>; |
216 | #interrupt-cells = <2>; | 215 | #interrupt-cells = <2>; |
217 | reg = <0x40000 0x40000>; | 216 | reg = <0x40000 0x40000>; |
218 | compatible = "chrp,open-pic"; | 217 | compatible = "chrp,open-pic"; |
219 | device_type = "open-pic"; | 218 | device_type = "open-pic"; |
220 | big-endian; | ||
221 | }; | 219 | }; |
222 | 220 | ||
223 | msi@41600 { | 221 | msi@41600 { |
diff --git a/arch/powerpc/boot/dts/mpc8548cds.dts b/arch/powerpc/boot/dts/mpc8548cds.dts index fa298a8c81cc..213c88e5aee8 100644 --- a/arch/powerpc/boot/dts/mpc8548cds.dts +++ b/arch/powerpc/boot/dts/mpc8548cds.dts | |||
@@ -208,14 +208,12 @@ | |||
208 | }; | 208 | }; |
209 | 209 | ||
210 | mpic: pic@40000 { | 210 | mpic: pic@40000 { |
211 | clock-frequency = <0>; | ||
212 | interrupt-controller; | 211 | interrupt-controller; |
213 | #address-cells = <0>; | 212 | #address-cells = <0>; |
214 | #interrupt-cells = <2>; | 213 | #interrupt-cells = <2>; |
215 | reg = <0x40000 0x40000>; | 214 | reg = <0x40000 0x40000>; |
216 | compatible = "chrp,open-pic"; | 215 | compatible = "chrp,open-pic"; |
217 | device_type = "open-pic"; | 216 | device_type = "open-pic"; |
218 | big-endian; | ||
219 | }; | 217 | }; |
220 | }; | 218 | }; |
221 | 219 | ||
diff --git a/arch/powerpc/boot/dts/mpc8555cds.dts b/arch/powerpc/boot/dts/mpc8555cds.dts index b025c566c10d..400f6dbc3a86 100644 --- a/arch/powerpc/boot/dts/mpc8555cds.dts +++ b/arch/powerpc/boot/dts/mpc8555cds.dts | |||
@@ -148,14 +148,12 @@ | |||
148 | }; | 148 | }; |
149 | 149 | ||
150 | mpic: pic@40000 { | 150 | mpic: pic@40000 { |
151 | clock-frequency = <0>; | ||
152 | interrupt-controller; | 151 | interrupt-controller; |
153 | #address-cells = <0>; | 152 | #address-cells = <0>; |
154 | #interrupt-cells = <2>; | 153 | #interrupt-cells = <2>; |
155 | reg = <0x40000 0x40000>; | 154 | reg = <0x40000 0x40000>; |
156 | compatible = "chrp,open-pic"; | 155 | compatible = "chrp,open-pic"; |
157 | device_type = "open-pic"; | 156 | device_type = "open-pic"; |
158 | big-endian; | ||
159 | }; | 157 | }; |
160 | 158 | ||
161 | cpm@919c0 { | 159 | cpm@919c0 { |
diff --git a/arch/powerpc/boot/dts/mpc8560ads.dts b/arch/powerpc/boot/dts/mpc8560ads.dts index 0cc16ab305d1..f0b1f98a2df8 100644 --- a/arch/powerpc/boot/dts/mpc8560ads.dts +++ b/arch/powerpc/boot/dts/mpc8560ads.dts | |||
@@ -134,6 +134,7 @@ | |||
134 | #address-cells = <0>; | 134 | #address-cells = <0>; |
135 | #interrupt-cells = <2>; | 135 | #interrupt-cells = <2>; |
136 | reg = <0x40000 0x40000>; | 136 | reg = <0x40000 0x40000>; |
137 | compatible = "chrp,open-pic"; | ||
137 | device_type = "open-pic"; | 138 | device_type = "open-pic"; |
138 | }; | 139 | }; |
139 | 140 | ||
diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts index a025a8ededc5..d9064ee2d2d8 100644 --- a/arch/powerpc/boot/dts/mpc8568mds.dts +++ b/arch/powerpc/boot/dts/mpc8568mds.dts | |||
@@ -202,14 +202,12 @@ | |||
202 | }; | 202 | }; |
203 | 203 | ||
204 | mpic: pic@40000 { | 204 | mpic: pic@40000 { |
205 | clock-frequency = <0>; | ||
206 | interrupt-controller; | 205 | interrupt-controller; |
207 | #address-cells = <0>; | 206 | #address-cells = <0>; |
208 | #interrupt-cells = <2>; | 207 | #interrupt-cells = <2>; |
209 | reg = <0x40000 0x40000>; | 208 | reg = <0x40000 0x40000>; |
210 | compatible = "chrp,open-pic"; | 209 | compatible = "chrp,open-pic"; |
211 | device_type = "open-pic"; | 210 | device_type = "open-pic"; |
212 | big-endian; | ||
213 | }; | 211 | }; |
214 | 212 | ||
215 | par_io@e0100 { | 213 | par_io@e0100 { |
diff --git a/arch/powerpc/boot/dts/mpc8572ds.dts b/arch/powerpc/boot/dts/mpc8572ds.dts index 174d51aff924..3ca8cae493b6 100644 --- a/arch/powerpc/boot/dts/mpc8572ds.dts +++ b/arch/powerpc/boot/dts/mpc8572ds.dts | |||
@@ -238,14 +238,12 @@ | |||
238 | }; | 238 | }; |
239 | 239 | ||
240 | mpic: pic@40000 { | 240 | mpic: pic@40000 { |
241 | clock-frequency = <0>; | ||
242 | interrupt-controller; | 241 | interrupt-controller; |
243 | #address-cells = <0>; | 242 | #address-cells = <0>; |
244 | #interrupt-cells = <2>; | 243 | #interrupt-cells = <2>; |
245 | reg = <0x40000 0x40000>; | 244 | reg = <0x40000 0x40000>; |
246 | compatible = "chrp,open-pic"; | 245 | compatible = "chrp,open-pic"; |
247 | device_type = "open-pic"; | 246 | device_type = "open-pic"; |
248 | big-endian; | ||
249 | }; | 247 | }; |
250 | }; | 248 | }; |
251 | 249 | ||
diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts index fa9c297501aa..186f102bfb47 100644 --- a/arch/powerpc/boot/dts/mpc8610_hpcd.dts +++ b/arch/powerpc/boot/dts/mpc8610_hpcd.dts | |||
@@ -172,14 +172,12 @@ | |||
172 | }; | 172 | }; |
173 | 173 | ||
174 | mpic: interrupt-controller@40000 { | 174 | mpic: interrupt-controller@40000 { |
175 | clock-frequency = <0>; | ||
176 | interrupt-controller; | 175 | interrupt-controller; |
177 | #address-cells = <0>; | 176 | #address-cells = <0>; |
178 | #interrupt-cells = <2>; | 177 | #interrupt-cells = <2>; |
179 | reg = <0x40000 0x40000>; | 178 | reg = <0x40000 0x40000>; |
180 | compatible = "chrp,open-pic"; | 179 | compatible = "chrp,open-pic"; |
181 | device_type = "open-pic"; | 180 | device_type = "open-pic"; |
182 | big-endian; | ||
183 | }; | 181 | }; |
184 | 182 | ||
185 | msi@41600 { | 183 | msi@41600 { |
diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts index 1e4bfe9cadb9..14f718d5e50b 100644 --- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts +++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts | |||
@@ -239,14 +239,12 @@ | |||
239 | }; | 239 | }; |
240 | 240 | ||
241 | mpic: pic@40000 { | 241 | mpic: pic@40000 { |
242 | clock-frequency = <0>; | ||
243 | interrupt-controller; | 242 | interrupt-controller; |
244 | #address-cells = <0>; | 243 | #address-cells = <0>; |
245 | #interrupt-cells = <2>; | 244 | #interrupt-cells = <2>; |
246 | reg = <0x40000 0x40000>; | 245 | reg = <0x40000 0x40000>; |
247 | compatible = "chrp,open-pic"; | 246 | compatible = "chrp,open-pic"; |
248 | device_type = "open-pic"; | 247 | device_type = "open-pic"; |
249 | big-endian; | ||
250 | }; | 248 | }; |
251 | 249 | ||
252 | global-utilities@e0000 { | 250 | global-utilities@e0000 { |
diff --git a/arch/powerpc/boot/dts/sbc8548.dts b/arch/powerpc/boot/dts/sbc8548.dts index 22d967178fe9..ce496fb27894 100644 --- a/arch/powerpc/boot/dts/sbc8548.dts +++ b/arch/powerpc/boot/dts/sbc8548.dts | |||
@@ -265,12 +265,10 @@ | |||
265 | mpic: pic@40000 { | 265 | mpic: pic@40000 { |
266 | interrupt-controller; | 266 | interrupt-controller; |
267 | #address-cells = <0>; | 267 | #address-cells = <0>; |
268 | #size-cells = <0>; | ||
269 | #interrupt-cells = <2>; | 268 | #interrupt-cells = <2>; |
270 | reg = <0x40000 0x40000>; | 269 | reg = <0x40000 0x40000>; |
271 | compatible = "chrp,open-pic"; | 270 | compatible = "chrp,open-pic"; |
272 | device_type = "open-pic"; | 271 | device_type = "open-pic"; |
273 | big-endian; | ||
274 | }; | 272 | }; |
275 | }; | 273 | }; |
276 | 274 | ||
diff --git a/arch/powerpc/boot/dts/sbc8560.dts b/arch/powerpc/boot/dts/sbc8560.dts index 0476802fba60..266350196cd2 100644 --- a/arch/powerpc/boot/dts/sbc8560.dts +++ b/arch/powerpc/boot/dts/sbc8560.dts | |||
@@ -155,8 +155,8 @@ | |||
155 | mpic: pic@40000 { | 155 | mpic: pic@40000 { |
156 | interrupt-controller; | 156 | interrupt-controller; |
157 | #address-cells = <0>; | 157 | #address-cells = <0>; |
158 | #size-cells = <0>; | ||
159 | #interrupt-cells = <2>; | 158 | #interrupt-cells = <2>; |
159 | compatible = "chrp,open-pic"; | ||
160 | reg = <0x40000 0x40000>; | 160 | reg = <0x40000 0x40000>; |
161 | device_type = "open-pic"; | 161 | device_type = "open-pic"; |
162 | }; | 162 | }; |
diff --git a/arch/powerpc/boot/dts/storcenter.dts b/arch/powerpc/boot/dts/storcenter.dts index 5893816c0bce..eab680ce10da 100644 --- a/arch/powerpc/boot/dts/storcenter.dts +++ b/arch/powerpc/boot/dts/storcenter.dts | |||
@@ -95,6 +95,7 @@ | |||
95 | 95 | ||
96 | mpic: interrupt-controller@40000 { | 96 | mpic: interrupt-controller@40000 { |
97 | #interrupt-cells = <2>; | 97 | #interrupt-cells = <2>; |
98 | #address-cells = <0>; | ||
98 | device_type = "open-pic"; | 99 | device_type = "open-pic"; |
99 | compatible = "chrp,open-pic"; | 100 | compatible = "chrp,open-pic"; |
100 | interrupt-controller; | 101 | interrupt-controller; |
diff --git a/arch/powerpc/boot/dts/stx_gp3_8560.dts b/arch/powerpc/boot/dts/stx_gp3_8560.dts index f81fd7fdb29e..096277b7192d 100644 --- a/arch/powerpc/boot/dts/stx_gp3_8560.dts +++ b/arch/powerpc/boot/dts/stx_gp3_8560.dts | |||
@@ -131,6 +131,7 @@ | |||
131 | #address-cells = <0>; | 131 | #address-cells = <0>; |
132 | #interrupt-cells = <2>; | 132 | #interrupt-cells = <2>; |
133 | reg = <0x40000 0x40000>; | 133 | reg = <0x40000 0x40000>; |
134 | compatible = "chrp,open-pic"; | ||
134 | device_type = "open-pic"; | 135 | device_type = "open-pic"; |
135 | }; | 136 | }; |
136 | 137 | ||
diff --git a/arch/powerpc/boot/dts/tqm8540.dts b/arch/powerpc/boot/dts/tqm8540.dts index 1addb3ae719e..8ee4664c7490 100644 --- a/arch/powerpc/boot/dts/tqm8540.dts +++ b/arch/powerpc/boot/dts/tqm8540.dts | |||
@@ -177,6 +177,7 @@ | |||
177 | #interrupt-cells = <2>; | 177 | #interrupt-cells = <2>; |
178 | reg = <0x40000 0x40000>; | 178 | reg = <0x40000 0x40000>; |
179 | device_type = "open-pic"; | 179 | device_type = "open-pic"; |
180 | compatible = "chrp,open-pic"; | ||
180 | }; | 181 | }; |
181 | }; | 182 | }; |
182 | 183 | ||
diff --git a/arch/powerpc/boot/dts/tqm8541.dts b/arch/powerpc/boot/dts/tqm8541.dts index 9e01093f496e..cadbebfd0edb 100644 --- a/arch/powerpc/boot/dts/tqm8541.dts +++ b/arch/powerpc/boot/dts/tqm8541.dts | |||
@@ -164,6 +164,7 @@ | |||
164 | #interrupt-cells = <2>; | 164 | #interrupt-cells = <2>; |
165 | reg = <0x40000 0x40000>; | 165 | reg = <0x40000 0x40000>; |
166 | device_type = "open-pic"; | 166 | device_type = "open-pic"; |
167 | compatible = "chrp,open-pic"; | ||
167 | }; | 168 | }; |
168 | 169 | ||
169 | cpm@919c0 { | 170 | cpm@919c0 { |
diff --git a/arch/powerpc/boot/dts/tqm8555.dts b/arch/powerpc/boot/dts/tqm8555.dts index a20eb06c482f..9d6dc04e8c40 100644 --- a/arch/powerpc/boot/dts/tqm8555.dts +++ b/arch/powerpc/boot/dts/tqm8555.dts | |||
@@ -164,6 +164,7 @@ | |||
164 | #interrupt-cells = <2>; | 164 | #interrupt-cells = <2>; |
165 | reg = <0x40000 0x40000>; | 165 | reg = <0x40000 0x40000>; |
166 | device_type = "open-pic"; | 166 | device_type = "open-pic"; |
167 | compatible = "chrp,open-pic"; | ||
167 | }; | 168 | }; |
168 | 169 | ||
169 | cpm@919c0 { | 170 | cpm@919c0 { |
diff --git a/arch/powerpc/boot/dts/tqm8560.dts b/arch/powerpc/boot/dts/tqm8560.dts index b9ac6c943b89..358cbd7c7572 100644 --- a/arch/powerpc/boot/dts/tqm8560.dts +++ b/arch/powerpc/boot/dts/tqm8560.dts | |||
@@ -145,6 +145,7 @@ | |||
145 | #interrupt-cells = <2>; | 145 | #interrupt-cells = <2>; |
146 | reg = <0x40000 0x40000>; | 146 | reg = <0x40000 0x40000>; |
147 | device_type = "open-pic"; | 147 | device_type = "open-pic"; |
148 | compatible = "chrp,open-pic"; | ||
148 | }; | 149 | }; |
149 | 150 | ||
150 | cpm@919c0 { | 151 | cpm@919c0 { |