diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-04 20:17:29 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-04 20:17:29 -0400 |
| commit | 42a0ae2282b512d1a8f6f020327f5f7b8f31a5ea (patch) | |
| tree | 1af6ca28b88e052f9603790b259278904d2936be /arch/powerpc/boot/dts/mpc8560ads.dts | |
| parent | 412a4ac5e9cf7fdeb6af562c25547a9b9da7674f (diff) | |
| parent | c4b6a77663f5879de20561144716cfb675815e82 (diff) | |
Merge commit 'kumar/next' into next
Diffstat (limited to 'arch/powerpc/boot/dts/mpc8560ads.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/mpc8560ads.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/mpc8560ads.dts b/arch/powerpc/boot/dts/mpc8560ads.dts index a5bb1ec70a5..6e85e1ba085 100644 --- a/arch/powerpc/boot/dts/mpc8560ads.dts +++ b/arch/powerpc/boot/dts/mpc8560ads.dts | |||
| @@ -71,14 +71,14 @@ | |||
| 71 | }; | 71 | }; |
| 72 | 72 | ||
| 73 | memory-controller@2000 { | 73 | memory-controller@2000 { |
| 74 | compatible = "fsl,8540-memory-controller"; | 74 | compatible = "fsl,mpc8540-memory-controller"; |
| 75 | reg = <0x2000 0x1000>; | 75 | reg = <0x2000 0x1000>; |
| 76 | interrupt-parent = <&mpic>; | 76 | interrupt-parent = <&mpic>; |
| 77 | interrupts = <18 2>; | 77 | interrupts = <18 2>; |
| 78 | }; | 78 | }; |
| 79 | 79 | ||
| 80 | L2: l2-cache-controller@20000 { | 80 | L2: l2-cache-controller@20000 { |
| 81 | compatible = "fsl,8540-l2-cache-controller"; | 81 | compatible = "fsl,mpc8540-l2-cache-controller"; |
| 82 | reg = <0x20000 0x1000>; | 82 | reg = <0x20000 0x1000>; |
| 83 | cache-line-size = <32>; // 32 bytes | 83 | cache-line-size = <32>; // 32 bytes |
| 84 | cache-size = <0x40000>; // L2, 256K | 84 | cache-size = <0x40000>; // L2, 256K |