diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-09-12 19:23:46 -0400 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-09-14 09:53:22 -0400 |
| commit | 1b3c5cdab49a605f0e048e1ccbf4cc61a2626485 (patch) | |
| tree | b81e6642588b00a7dbb42611614e745517b6a6b9 /arch/powerpc/boot/dts/mpc836x_mds.dts | |
| parent | f0c8ac8083cbd9347b398bfddcca20f1e2786016 (diff) | |
[POWERPC] Move PCI nodes to be sibilings with SOC nodes
Updated the device trees to have the PCI nodes be at the same level as
the SOC node. This is to make it so that the SOC nodes children address
space is just on chip registers and not other bus memory as well.
Also, for PCIe nodes added a P2P bridge to handle the virtual P2P bridge
that exists in the PHB.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/boot/dts/mpc836x_mds.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/mpc836x_mds.dts | 119 |
1 files changed, 59 insertions, 60 deletions
diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts index f14e88ee0f1c..fbd1573c348b 100644 --- a/arch/powerpc/boot/dts/mpc836x_mds.dts +++ b/arch/powerpc/boot/dts/mpc836x_mds.dts | |||
| @@ -111,66 +111,6 @@ | |||
| 111 | descriptor-types-mask = <01010ebf>; | 111 | descriptor-types-mask = <01010ebf>; |
| 112 | }; | 112 | }; |
| 113 | 113 | ||
| 114 | pci@8500 { | ||
| 115 | interrupt-map-mask = <f800 0 0 7>; | ||
| 116 | interrupt-map = < | ||
| 117 | |||
| 118 | /* IDSEL 0x11 AD17 */ | ||
| 119 | 8800 0 0 1 &ipic 14 8 | ||
| 120 | 8800 0 0 2 &ipic 15 8 | ||
| 121 | 8800 0 0 3 &ipic 16 8 | ||
| 122 | 8800 0 0 4 &ipic 17 8 | ||
| 123 | |||
| 124 | /* IDSEL 0x12 AD18 */ | ||
| 125 | 9000 0 0 1 &ipic 16 8 | ||
| 126 | 9000 0 0 2 &ipic 17 8 | ||
| 127 | 9000 0 0 3 &ipic 14 8 | ||
| 128 | 9000 0 0 4 &ipic 15 8 | ||
| 129 | |||
| 130 | /* IDSEL 0x13 AD19 */ | ||
| 131 | 9800 0 0 1 &ipic 17 8 | ||
| 132 | 9800 0 0 2 &ipic 14 8 | ||
| 133 | 9800 0 0 3 &ipic 15 8 | ||
| 134 | 9800 0 0 4 &ipic 16 8 | ||
| 135 | |||
| 136 | /* IDSEL 0x15 AD21*/ | ||
| 137 | a800 0 0 1 &ipic 14 8 | ||
| 138 | a800 0 0 2 &ipic 15 8 | ||
| 139 | a800 0 0 3 &ipic 16 8 | ||
| 140 | a800 0 0 4 &ipic 17 8 | ||
| 141 | |||
| 142 | /* IDSEL 0x16 AD22*/ | ||
| 143 | b000 0 0 1 &ipic 17 8 | ||
| 144 | b000 0 0 2 &ipic 14 8 | ||
| 145 | b000 0 0 3 &ipic 15 8 | ||
| 146 | b000 0 0 4 &ipic 16 8 | ||
| 147 | |||
| 148 | /* IDSEL 0x17 AD23*/ | ||
| 149 | b800 0 0 1 &ipic 16 8 | ||
| 150 | b800 0 0 2 &ipic 17 8 | ||
| 151 | b800 0 0 3 &ipic 14 8 | ||
| 152 | b800 0 0 4 &ipic 15 8 | ||
| 153 | |||
| 154 | /* IDSEL 0x18 AD24*/ | ||
| 155 | c000 0 0 1 &ipic 15 8 | ||
| 156 | c000 0 0 2 &ipic 16 8 | ||
| 157 | c000 0 0 3 &ipic 17 8 | ||
| 158 | c000 0 0 4 &ipic 14 8>; | ||
| 159 | interrupt-parent = < &ipic >; | ||
| 160 | interrupts = <42 8>; | ||
| 161 | bus-range = <0 0>; | ||
| 162 | ranges = <02000000 0 a0000000 a0000000 0 10000000 | ||
| 163 | 42000000 0 80000000 80000000 0 10000000 | ||
| 164 | 01000000 0 00000000 e2000000 0 00100000>; | ||
| 165 | clock-frequency = <3f940aa>; | ||
| 166 | #interrupt-cells = <1>; | ||
| 167 | #size-cells = <2>; | ||
| 168 | #address-cells = <3>; | ||
| 169 | reg = <8500 100>; | ||
| 170 | compatible = "fsl,mpc8349-pci"; | ||
| 171 | device_type = "pci"; | ||
| 172 | }; | ||
| 173 | |||
| 174 | ipic: pic@700 { | 114 | ipic: pic@700 { |
| 175 | interrupt-controller; | 115 | interrupt-controller; |
| 176 | #address-cells = <0>; | 116 | #address-cells = <0>; |
| @@ -365,6 +305,65 @@ | |||
| 365 | interrupts = <20 8 21 8>; //high:32 low:33 | 305 | interrupts = <20 8 21 8>; //high:32 low:33 |
| 366 | interrupt-parent = < &ipic >; | 306 | interrupt-parent = < &ipic >; |
| 367 | }; | 307 | }; |
| 308 | }; | ||
| 368 | 309 | ||
| 310 | pci@e0008500 { | ||
| 311 | interrupt-map-mask = <f800 0 0 7>; | ||
| 312 | interrupt-map = < | ||
| 313 | |||
| 314 | /* IDSEL 0x11 AD17 */ | ||
| 315 | 8800 0 0 1 &ipic 14 8 | ||
| 316 | 8800 0 0 2 &ipic 15 8 | ||
| 317 | 8800 0 0 3 &ipic 16 8 | ||
| 318 | 8800 0 0 4 &ipic 17 8 | ||
| 319 | |||
| 320 | /* IDSEL 0x12 AD18 */ | ||
| 321 | 9000 0 0 1 &ipic 16 8 | ||
| 322 | 9000 0 0 2 &ipic 17 8 | ||
| 323 | 9000 0 0 3 &ipic 14 8 | ||
| 324 | 9000 0 0 4 &ipic 15 8 | ||
| 325 | |||
| 326 | /* IDSEL 0x13 AD19 */ | ||
| 327 | 9800 0 0 1 &ipic 17 8 | ||
| 328 | 9800 0 0 2 &ipic 14 8 | ||
| 329 | 9800 0 0 3 &ipic 15 8 | ||
| 330 | 9800 0 0 4 &ipic 16 8 | ||
| 331 | |||
| 332 | /* IDSEL 0x15 AD21*/ | ||
| 333 | a800 0 0 1 &ipic 14 8 | ||
| 334 | a800 0 0 2 &ipic 15 8 | ||
| 335 | a800 0 0 3 &ipic 16 8 | ||
| 336 | a800 0 0 4 &ipic 17 8 | ||
| 337 | |||
| 338 | /* IDSEL 0x16 AD22*/ | ||
| 339 | b000 0 0 1 &ipic 17 8 | ||
| 340 | b000 0 0 2 &ipic 14 8 | ||
| 341 | b000 0 0 3 &ipic 15 8 | ||
| 342 | b000 0 0 4 &ipic 16 8 | ||
| 343 | |||
| 344 | /* IDSEL 0x17 AD23*/ | ||
| 345 | b800 0 0 1 &ipic 16 8 | ||
| 346 | b800 0 0 2 &ipic 17 8 | ||
| 347 | b800 0 0 3 &ipic 14 8 | ||
| 348 | b800 0 0 4 &ipic 15 8 | ||
| 349 | |||
| 350 | /* IDSEL 0x18 AD24*/ | ||
| 351 | c000 0 0 1 &ipic 15 8 | ||
| 352 | c000 0 0 2 &ipic 16 8 | ||
| 353 | c000 0 0 3 &ipic 17 8 | ||
| 354 | c000 0 0 4 &ipic 14 8>; | ||
| 355 | interrupt-parent = < &ipic >; | ||
| 356 | interrupts = <42 8>; | ||
| 357 | bus-range = <0 0>; | ||
| 358 | ranges = <02000000 0 a0000000 a0000000 0 10000000 | ||
| 359 | 42000000 0 80000000 80000000 0 10000000 | ||
| 360 | 01000000 0 00000000 e2000000 0 00100000>; | ||
| 361 | clock-frequency = <3f940aa>; | ||
| 362 | #interrupt-cells = <1>; | ||
| 363 | #size-cells = <2>; | ||
| 364 | #address-cells = <3>; | ||
| 365 | reg = <e0008500 100>; | ||
| 366 | compatible = "fsl,mpc8349-pci"; | ||
| 367 | device_type = "pci"; | ||
| 369 | }; | 368 | }; |
| 370 | }; | 369 | }; |