diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-28 09:15:34 +0300 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-28 09:15:34 +0300 |
| commit | 6469c92e0a4879e57bccbbacb2b724672a4fa8fb (patch) | |
| tree | 65b3377bdea03342f64f5cd414d61824ff2cf354 /arch/powerpc/boot/dts/makalu.dts | |
| parent | 0411648e445d850ded24aba98f1774c417bf5658 (diff) | |
| parent | 0b21bcd5b52779be0c18a6c201ae8f060d3b2bf2 (diff) | |
| download | linux-6469c92e0a4879e57bccbbacb2b724672a4fa8fb.tar.xz | |
Merge commit 'jwb/jwb-merge' into merge
Manual merge of:
arch/powerpc/configs/44x/warp_defconfig
Diffstat (limited to 'arch/powerpc/boot/dts/makalu.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/makalu.dts | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/makalu.dts b/arch/powerpc/boot/dts/makalu.dts index 945508c7e7d8..ffc246e72670 100644 --- a/arch/powerpc/boot/dts/makalu.dts +++ b/arch/powerpc/boot/dts/makalu.dts @@ -90,8 +90,11 @@ clock-frequency = <0>; /* Filled in by U-Boot */ SDRAM0: memory-controller { - compatible = "ibm,sdram-405ex"; + compatible = "ibm,sdram-405ex", "ibm,sdram-4xx-ddr2"; dcr-reg = <0x010 0x002>; + interrupt-parent = <&UIC2>; + interrupts = <0x5 0x4 /* ECC DED Error */ + 0x6 0x4 /* ECC SEC Error */ >; }; MAL0: mcmal { |