diff options
| author | David S. Miller <davem@davemloft.net> | 2011-12-02 13:49:21 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-02 13:49:21 -0500 |
| commit | b3613118eb30a589d971e4eccbbb2a1314f5dfd4 (patch) | |
| tree | 868c1ee59e1b5c19a4f2e43716400d0001a994e5 /arch/powerpc/boot | |
| parent | 7505afe28c16a8d386624930a018d0052c75d687 (diff) | |
| parent | 5983fe2b29df5885880d7fa3b91aca306c7564ef (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/powerpc/boot')
| -rw-r--r-- | arch/powerpc/boot/dts/p1023rds.dts | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/arch/powerpc/boot/dts/p1023rds.dts b/arch/powerpc/boot/dts/p1023rds.dts index d9b776740a67..d3b478242ea9 100644 --- a/arch/powerpc/boot/dts/p1023rds.dts +++ b/arch/powerpc/boot/dts/p1023rds.dts | |||
| @@ -449,6 +449,7 @@ | |||
| 449 | interrupt-parent = <&mpic>; | 449 | interrupt-parent = <&mpic>; |
| 450 | interrupts = <16 2>; | 450 | interrupts = <16 2>; |
| 451 | interrupt-map-mask = <0xf800 0 0 7>; | 451 | interrupt-map-mask = <0xf800 0 0 7>; |
| 452 | /* IRQ[0:3] are pulled up on board, set to active-low */ | ||
| 452 | interrupt-map = < | 453 | interrupt-map = < |
| 453 | /* IDSEL 0x0 */ | 454 | /* IDSEL 0x0 */ |
| 454 | 0000 0 0 1 &mpic 0 1 | 455 | 0000 0 0 1 &mpic 0 1 |
| @@ -488,11 +489,15 @@ | |||
| 488 | interrupt-parent = <&mpic>; | 489 | interrupt-parent = <&mpic>; |
| 489 | interrupts = <16 2>; | 490 | interrupts = <16 2>; |
| 490 | interrupt-map-mask = <0xf800 0 0 7>; | 491 | interrupt-map-mask = <0xf800 0 0 7>; |
| 492 | /* | ||
| 493 | * IRQ[4:6] only for PCIe, set to active-high, | ||
| 494 | * IRQ[7] is pulled up on board, set to active-low | ||
| 495 | */ | ||
| 491 | interrupt-map = < | 496 | interrupt-map = < |
| 492 | /* IDSEL 0x0 */ | 497 | /* IDSEL 0x0 */ |
| 493 | 0000 0 0 1 &mpic 4 1 | 498 | 0000 0 0 1 &mpic 4 2 |
| 494 | 0000 0 0 2 &mpic 5 1 | 499 | 0000 0 0 2 &mpic 5 2 |
| 495 | 0000 0 0 3 &mpic 6 1 | 500 | 0000 0 0 3 &mpic 6 2 |
| 496 | 0000 0 0 4 &mpic 7 1 | 501 | 0000 0 0 4 &mpic 7 1 |
| 497 | >; | 502 | >; |
| 498 | ranges = <0x2000000 0x0 0xa0000000 | 503 | ranges = <0x2000000 0x0 0xa0000000 |
| @@ -527,12 +532,16 @@ | |||
| 527 | interrupt-parent = <&mpic>; | 532 | interrupt-parent = <&mpic>; |
| 528 | interrupts = <16 2>; | 533 | interrupts = <16 2>; |
| 529 | interrupt-map-mask = <0xf800 0 0 7>; | 534 | interrupt-map-mask = <0xf800 0 0 7>; |
| 535 | /* | ||
| 536 | * IRQ[8:10] are pulled up on board, set to active-low | ||
| 537 | * IRQ[11] only for PCIe, set to active-high, | ||
| 538 | */ | ||
| 530 | interrupt-map = < | 539 | interrupt-map = < |
| 531 | /* IDSEL 0x0 */ | 540 | /* IDSEL 0x0 */ |
| 532 | 0000 0 0 1 &mpic 8 1 | 541 | 0000 0 0 1 &mpic 8 1 |
| 533 | 0000 0 0 2 &mpic 9 1 | 542 | 0000 0 0 2 &mpic 9 1 |
| 534 | 0000 0 0 3 &mpic 10 1 | 543 | 0000 0 0 3 &mpic 10 1 |
| 535 | 0000 0 0 4 &mpic 11 1 | 544 | 0000 0 0 4 &mpic 11 2 |
| 536 | >; | 545 | >; |
| 537 | ranges = <0x2000000 0x0 0x80000000 | 546 | ranges = <0x2000000 0x0 0x80000000 |
| 538 | 0x2000000 0x0 0x80000000 | 547 | 0x2000000 0x0 0x80000000 |