Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[linux-2.6-omap-h63xx.git] / arch / powerpc / boot / dts / makalu.dts

diff --git a/arch/powerpc/boot/dts/makalu.dts b/arch/powerpc/boot/dts/makalu.dts
index 1dfcd7ed199c118ffd39a37c668a593f8c0e91a6..ffc246e726709460c42244831c71a95cbfe603bb 100644 (file)
--- 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 {
@@ -207,7 +210,7 @@
                        EMAC0: ethernet@ef600900 {
                                linux,network-index = <0x0>;
                                device_type = "network";
-                               compatible = "ibm,emac-405ex", "ibm,emac4";
+                               compatible = "ibm,emac-405ex", "ibm,emac4sync";
                                interrupt-parent = <&EMAC0>;
                                interrupts = <0x0 0x1>;
                                #interrupt-cells = <1>;
@@ -215,7 +218,7 @@
                                #size-cells = <0>;
                                interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4
                                                /*Wake*/  0x1 &UIC1 0x1d 0x4>;
-                               reg = <0xef600900 0x00000070>;
+                               reg = <0xef600900 0x000000c4>;
                                local-mac-address = [000000000000]; /* Filled in by U-Boot */
                                mal-device = <&MAL0>;
                                mal-tx-channel = <0>;
@@ -235,7 +238,7 @@
                        EMAC1: ethernet@ef600a00 {
                                linux,network-index = <0x1>;
                                device_type = "network";
-                               compatible = "ibm,emac-405ex", "ibm,emac4";
+                               compatible = "ibm,emac-405ex", "ibm,emac4sync";
                                interrupt-parent = <&EMAC1>;
                                interrupts = <0x0 0x1>;
                                #interrupt-cells = <1>;
@@ -243,7 +246,7 @@
                                #size-cells = <0>;
                                interrupt-map = </*Status*/ 0x0 &UIC0 0x19 0x4
                                                /*Wake*/  0x1 &UIC1 0x1f 0x4>;
-                               reg = <0xef600a00 0x00000070>;
+                               reg = <0xef600a00 0x000000c4>;
                                local-mac-address = [000000000000]; /* Filled in by U-Boot */
                                mal-device = <&MAL0>;
                                mal-tx-channel = <1>;