diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-05 10:17:29 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-05 10:17:29 +1000 |
| commit | 42a0ae2282b512d1a8f6f020327f5f7b8f31a5ea (patch) | |
| tree | 1af6ca28b88e052f9603790b259278904d2936be /arch/powerpc/boot/dts/mpc8540ads.dts | |
| parent | 412a4ac5e9cf7fdeb6af562c25547a9b9da7674f (diff) | |
| parent | c4b6a77663f5879de20561144716cfb675815e82 (diff) | |
| download | kernel_samsung_smdk4412-42a0ae2282b512d1a8f6f020327f5f7b8f31a5ea.zip kernel_samsung_smdk4412-42a0ae2282b512d1a8f6f020327f5f7b8f31a5ea.tar.gz kernel_samsung_smdk4412-42a0ae2282b512d1a8f6f020327f5f7b8f31a5ea.tar.bz2 | |
Merge commit 'kumar/next' into next
Diffstat (limited to 'arch/powerpc/boot/dts/mpc8540ads.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/mpc8540ads.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/mpc8540ads.dts b/arch/powerpc/boot/dts/mpc8540ads.dts index 9dc2929..8d1bf0f 100644 --- a/arch/powerpc/boot/dts/mpc8540ads.dts +++ b/arch/powerpc/boot/dts/mpc8540ads.dts @@ -71,14 +71,14 @@ }; memory-controller@2000 { - compatible = "fsl,8540-memory-controller"; + compatible = "fsl,mpc8540-memory-controller"; reg = <0x2000 0x1000>; interrupt-parent = <&mpic>; interrupts = <18 2>; }; L2: l2-cache-controller@20000 { - compatible = "fsl,8540-l2-cache-controller"; + compatible = "fsl,mpc8540-l2-cache-controller"; reg = <0x20000 0x1000>; cache-line-size = <32>; // 32 bytes cache-size = <0x40000>; // L2, 256K |