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