diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-12-03 04:11:06 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-12-03 04:11:06 -0500 |
| commit | 527491885554002837b5742202adc0ab5f536e54 (patch) | |
| tree | 6d9c44776e0b4368eccd414b92b957fac3c5a4c6 /arch/powerpc/boot | |
| parent | cea555d384b85271035814c5adad23e6c7fc5d2a (diff) | |
| parent | 2434bbb30e79468c49cff3cff6005236f55ed188 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'arch/powerpc/boot')
| -rw-r--r-- | arch/powerpc/boot/dts/mpc832x_rdb.dts | 4 | ||||
| -rw-r--r-- | arch/powerpc/boot/dts/mpc8572ds.dts | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts index 226ff066652b..dea30910c136 100644 --- a/arch/powerpc/boot/dts/mpc832x_rdb.dts +++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts | |||
| @@ -18,8 +18,8 @@ | |||
| 18 | #size-cells = <1>; | 18 | #size-cells = <1>; |
| 19 | 19 | ||
| 20 | aliases { | 20 | aliases { |
| 21 | ethernet0 = &enet0; | 21 | ethernet0 = &enet1; |
| 22 | ethernet1 = &enet1; | 22 | ethernet1 = &enet0; |
| 23 | serial0 = &serial0; | 23 | serial0 = &serial0; |
| 24 | serial1 = &serial1; | 24 | serial1 = &serial1; |
| 25 | pci0 = &pci0; | 25 | pci0 = &pci0; |
diff --git a/arch/powerpc/boot/dts/mpc8572ds.dts b/arch/powerpc/boot/dts/mpc8572ds.dts index cadd4652a695..5c69b2fafd32 100644 --- a/arch/powerpc/boot/dts/mpc8572ds.dts +++ b/arch/powerpc/boot/dts/mpc8572ds.dts | |||
| @@ -90,7 +90,7 @@ | |||
| 90 | compatible = "fsl,mpc8572-l2-cache-controller"; | 90 | compatible = "fsl,mpc8572-l2-cache-controller"; |
| 91 | reg = <0x20000 0x1000>; | 91 | reg = <0x20000 0x1000>; |
| 92 | cache-line-size = <32>; // 32 bytes | 92 | cache-line-size = <32>; // 32 bytes |
| 93 | cache-size = <0x80000>; // L2, 512K | 93 | cache-size = <0x100000>; // L2, 1M |
| 94 | interrupt-parent = <&mpic>; | 94 | interrupt-parent = <&mpic>; |
| 95 | interrupts = <16 2>; | 95 | interrupts = <16 2>; |
| 96 | }; | 96 | }; |