[POWERPC] 44x: Sequoia and Rainier updates for 2.6.25

PowerPC 440Epx/GRx Sequoia/Rainier updates for 2.6.25

Signed-off-by: Valentine Barshak <vbarshak@ru.mvista.com>
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>

4 files changed, 7 insertions, 4 deletions

diff --git a/arch/powerpc/boot/cuboot-rainier.c b/arch/powerpc/boot/cuboot-rainier.c
index 1c1af31e317a..6be15cad2f7e 100644
--- a/arch/powerpc/boot/cuboot-rainier.c
+++ b/arch/powerpc/boot/cuboot-rainier.c
@@ -39,7 +39,7 @@ static void rainier_fixups(void)
 {
         unsigned long sysclk = 33333333;
 
-        ibm440ep_fixup_clocks(sysclk, 11059200);
+        ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
         ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
         ibm4xx_denali_fixup_memsize();
         dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr);
diff --git a/arch/powerpc/boot/cuboot-sequoia.c b/arch/powerpc/boot/cuboot-sequoia.c
index 66b7eeb82b46..f555575a44de 100644
--- a/arch/powerpc/boot/cuboot-sequoia.c
+++ b/arch/powerpc/boot/cuboot-sequoia.c
@@ -39,7 +39,7 @@ static void sequoia_fixups(void)
 {
         unsigned long sysclk = 33333333;
 
-        ibm440ep_fixup_clocks(sysclk, 11059200, 25000000);
+        ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
         ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
         ibm4xx_denali_fixup_memsize();
         dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr);
diff --git a/arch/powerpc/boot/dts/rainier.dts b/arch/powerpc/boot/dts/rainier.dts
index f29169e886f3..cf1b95d1f14b 100644
--- a/arch/powerpc/boot/dts/rainier.dts
+++ b/arch/powerpc/boot/dts/rainier.dts
@@ -94,7 +94,6 @@
                 clock-frequency = <0>; /* Filled in by zImage */
                 
                 SDRAM0: sdram {
-                        device_type = "memory-controller";
                         compatible = "ibm,sdram-440grx", "ibm,sdram-44x-ddr2denali";
                         dcr-reg = <010 2>;
                 };
@@ -245,6 +244,7 @@
                                 device_type = "rgmii-interface";
                                 compatible = "ibm,rgmii-440grx", "ibm,rgmii";
                                 reg = <ef601000 8>;
+                                has-mdio;
                         };
 
                         EMAC0: ethernet@ef600e00 {
@@ -273,6 +273,8 @@
                                 zmii-channel = <0>;
                                 rgmii-device = <&RGMII0>;
                                 rgmii-channel = <0>;
+                                has-inverted-stacr-oc;
+                                has-new-stacr-staopc;
                         };
 
                         EMAC1: ethernet@ef600f00 {
@@ -301,6 +303,8 @@
                                 zmii-channel = <1>;
                                 rgmii-device = <&RGMII0>;
                                 rgmii-channel = <1>;
+                                has-inverted-stacr-oc;
+                                has-new-stacr-staopc;
                         };
                 };
         };
diff --git a/arch/powerpc/boot/dts/sequoia.dts b/arch/powerpc/boot/dts/sequoia.dts
index b20e516287d1..0c078483601c 100644
--- a/arch/powerpc/boot/dts/sequoia.dts
+++ b/arch/powerpc/boot/dts/sequoia.dts
@@ -94,7 +94,6 @@
                 clock-frequency = <0>; /* Filled in by zImage */
 
                 SDRAM0: sdram {
-                        device_type = "memory-controller";
                         compatible = "ibm,sdram-440epx", "ibm,sdram-44x-ddr2denali";
                         dcr-reg = <010 2>;
                 };