diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-28 09:01:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-28 09:01:42 -0800 |
| commit | c4568d6c7ec7557fbe8656286aea29f67388f7d4 (patch) | |
| tree | 783873ec85ca67f2de69986645b1b007231f8f6d /arch/powerpc/boot/dts/kilauea.dts | |
| parent | 78a768b6ca40e104442ade090226ed4ee0e6cebf (diff) | |
| parent | 4c456a67f501b8b15542c7c21c28812bf88f484b (diff) | |
| download | blackbird-op-linux-c4568d6c7ec7557fbe8656286aea29f67388f7d4.tar.gz blackbird-op-linux-c4568d6c7ec7557fbe8656286aea29f67388f7d4.zip | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/mm: Fix handling of _PAGE_COHERENT in BAT setup code
powerpc/pseries: Correct VIO bus accounting problem in CMO env.
powerpc: More printing warning fixes for the l64 to ll64 conversion
powerpc: Remove arch/ppc cruft from Kconfig
powerpc: Printing fix for l64 to ll64 conversion: phyp_dump.c
powerpc/embedded6xx: Update defconfigs
powerpc/8xx: Update defconfigs
powerpc/86xx: Update defconfigs
powerpc/83xx: Update defconfigs
powerpc/85xx: Update defconfigs
powerpc/mpc8313erdb: fix kernel panic because mdio device is not probed
powerpc/4xx: Update multi-board PowerPC 4xx defconfigs
powerpc/44x: Update PowerPC 44x defconfigs
powerpc/40x: Update PowerPC 40x defconfigs
powerpc/85xx: Fix typo in mpc8572ds dts
powerpc/44x: Warp patches for the new NDFC driver
powerpc/4xx: DTS: Add Add'l SDRAM0 Compatible and Interrupt Info
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 dececc4b5ff2..2804444812e5 100644 --- a/arch/powerpc/boot/dts/kilauea.dts +++ b/arch/powerpc/boot/dts/kilauea.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 { |
