diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:10:29 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:10:29 -0500 |
| commit | 0285ae37d4366b2d614df0c83cb413cf59ad8944 (patch) | |
| tree | b7d27eccdeefcf16f63f122c59df95fb1db5c447 | |
| parent | 8c82da5e2495589b7b70a43789e7cbd61a486ed0 (diff) | |
| parent | 06a5bad898b332b8c6525fc8c4d1c1c9a8df65de (diff) | |
Merge commit 'jwb/next' into next
| -rw-r--r-- | arch/powerpc/boot/dts/katmai.dts | 22 | ||||
| -rw-r--r-- | arch/powerpc/boot/dts/yosemite.dts | 14 |
2 files changed, 13 insertions, 23 deletions
diff --git a/arch/powerpc/boot/dts/katmai.dts b/arch/powerpc/boot/dts/katmai.dts index b8cd97c5c74e..51eb6ed5da2d 100644 --- a/arch/powerpc/boot/dts/katmai.dts +++ b/arch/powerpc/boot/dts/katmai.dts | |||
| @@ -253,8 +253,8 @@ | |||
| 253 | ranges = <0x02000000 0x00000000 0x80000000 0x0000000d 0x80000000 0x00000000 0x80000000 | 253 | ranges = <0x02000000 0x00000000 0x80000000 0x0000000d 0x80000000 0x00000000 0x80000000 |
| 254 | 0x01000000 0x00000000 0x00000000 0x0000000c 0x08000000 0x00000000 0x00010000>; | 254 | 0x01000000 0x00000000 0x00000000 0x0000000c 0x08000000 0x00000000 0x00010000>; |
| 255 | 255 | ||
| 256 | /* Inbound 2GB range starting at 0 */ | 256 | /* Inbound 4GB range starting at 0 */ |
| 257 | dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; | 257 | dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x1 0x00000000>; |
| 258 | 258 | ||
| 259 | /* This drives busses 0 to 0xf */ | 259 | /* This drives busses 0 to 0xf */ |
| 260 | bus-range = <0x0 0xf>; | 260 | bus-range = <0x0 0xf>; |
| @@ -297,10 +297,10 @@ | |||
| 297 | ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x00000000 0x00000000 0x80000000 | 297 | ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x00000000 0x00000000 0x80000000 |
| 298 | 0x01000000 0x00000000 0x00000000 0x0000000f 0x80000000 0x00000000 0x00010000>; | 298 | 0x01000000 0x00000000 0x00000000 0x0000000f 0x80000000 0x00000000 0x00010000>; |
| 299 | 299 | ||
| 300 | /* Inbound 2GB range starting at 0 */ | 300 | /* Inbound 4GB range starting at 0 */ |
| 301 | dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; | 301 | dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x1 0x00000000>; |
| 302 | 302 | ||
| 303 | /* This drives busses 10 to 0x1f */ | 303 | /* This drives busses 0x10 to 0x1f */ |
| 304 | bus-range = <0x10 0x1f>; | 304 | bus-range = <0x10 0x1f>; |
| 305 | 305 | ||
| 306 | /* Legacy interrupts (note the weird polarity, the bridge seems | 306 | /* Legacy interrupts (note the weird polarity, the bridge seems |
| @@ -338,10 +338,10 @@ | |||
| 338 | ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x80000000 0x00000000 0x80000000 | 338 | ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x80000000 0x00000000 0x80000000 |
| 339 | 0x01000000 0x00000000 0x00000000 0x0000000f 0x80010000 0x00000000 0x00010000>; | 339 | 0x01000000 0x00000000 0x00000000 0x0000000f 0x80010000 0x00000000 0x00010000>; |
| 340 | 340 | ||
| 341 | /* Inbound 2GB range starting at 0 */ | 341 | /* Inbound 4GB range starting at 0 */ |
| 342 | dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; | 342 | dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x1 0x00000000>; |
| 343 | 343 | ||
| 344 | /* This drives busses 10 to 0x1f */ | 344 | /* This drives busses 0x20 to 0x2f */ |
| 345 | bus-range = <0x20 0x2f>; | 345 | bus-range = <0x20 0x2f>; |
| 346 | 346 | ||
| 347 | /* Legacy interrupts (note the weird polarity, the bridge seems | 347 | /* Legacy interrupts (note the weird polarity, the bridge seems |
| @@ -379,10 +379,10 @@ | |||
| 379 | ranges = <0x02000000 0x00000000 0x80000000 0x0000000f 0x00000000 0x00000000 0x80000000 | 379 | ranges = <0x02000000 0x00000000 0x80000000 0x0000000f 0x00000000 0x00000000 0x80000000 |
| 380 | 0x01000000 0x00000000 0x00000000 0x0000000f 0x80020000 0x00000000 0x00010000>; | 380 | 0x01000000 0x00000000 0x00000000 0x0000000f 0x80020000 0x00000000 0x00010000>; |
| 381 | 381 | ||
| 382 | /* Inbound 2GB range starting at 0 */ | 382 | /* Inbound 4GB range starting at 0 */ |
| 383 | dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; | 383 | dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x1 0x00000000>; |
| 384 | 384 | ||
| 385 | /* This drives busses 10 to 0x1f */ | 385 | /* This drives busses 0x30 to 0x3f */ |
| 386 | bus-range = <0x30 0x3f>; | 386 | bus-range = <0x30 0x3f>; |
| 387 | 387 | ||
| 388 | /* Legacy interrupts (note the weird polarity, the bridge seems | 388 | /* Legacy interrupts (note the weird polarity, the bridge seems |
diff --git a/arch/powerpc/boot/dts/yosemite.dts b/arch/powerpc/boot/dts/yosemite.dts index 1fa3cb4c4ebb..64923245f0e5 100644 --- a/arch/powerpc/boot/dts/yosemite.dts +++ b/arch/powerpc/boot/dts/yosemite.dts | |||
| @@ -282,20 +282,10 @@ | |||
| 282 | /* Inbound 2GB range starting at 0 */ | 282 | /* Inbound 2GB range starting at 0 */ |
| 283 | dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; | 283 | dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; |
| 284 | 284 | ||
| 285 | /* Bamboo has all 4 IRQ pins tied together per slot */ | ||
| 286 | interrupt-map-mask = <0xf800 0x0 0x0 0x0>; | 285 | interrupt-map-mask = <0xf800 0x0 0x0 0x0>; |
| 287 | interrupt-map = < | 286 | interrupt-map = < |
| 288 | /* IDSEL 1 */ | 287 | /* IDSEL 12 */ |
| 289 | 0x800 0x0 0x0 0x0 &UIC0 0x1c 0x8 | 288 | 0x6000 0x0 0x0 0x0 &UIC0 0x19 0x8 |
| 290 | |||
| 291 | /* IDSEL 2 */ | ||
| 292 | 0x1000 0x0 0x0 0x0 &UIC0 0x1b 0x8 | ||
| 293 | |||
| 294 | /* IDSEL 3 */ | ||
| 295 | 0x1800 0x0 0x0 0x0 &UIC0 0x1a 0x8 | ||
| 296 | |||
| 297 | /* IDSEL 4 */ | ||
| 298 | 0x2000 0x0 0x0 0x0 &UIC0 0x19 0x8 | ||
| 299 | >; | 289 | >; |
| 300 | }; | 290 | }; |
| 301 | }; | 291 | }; |