From e7601ac513fe5d5e7eabc61bf455b8eb3c1c2d11 Mon Sep 17 00:00:00 2001
From: Valentine Barshak <vbarshak@ru.mvista.com>
Date: Thu, 6 Dec 2007 19:21:12 +0300
Subject: [PATCH] --- yaml --- r: 81195 b: refs/heads/master c:
 58c50192675cfbaa51cf9ccf2ef1180d45170ec8 h: refs/heads/master i:   81193:
 c6ff228b8bc155e0f527a689b1b2a40f6f362fde   81191:
 587561129759dfb02261158aa5d29686aac5c253 v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/powerpc/boot/cuboot-rainier.c | 2 +-
 trunk/arch/powerpc/boot/cuboot-sequoia.c | 2 +-
 trunk/arch/powerpc/boot/dts/rainier.dts  | 6 +++++-
 trunk/arch/powerpc/boot/dts/sequoia.dts  | 1 -
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 124d219c5b5c..5aa6171d5999 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ac30c314529af21ae739375d25c7da78887363b
+refs/heads/master: 58c50192675cfbaa51cf9ccf2ef1180d45170ec8
diff --git a/trunk/arch/powerpc/boot/cuboot-rainier.c b/trunk/arch/powerpc/boot/cuboot-rainier.c
index 1c1af31e317a..6be15cad2f7e 100644
--- a/trunk/arch/powerpc/boot/cuboot-rainier.c
+++ b/trunk/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/trunk/arch/powerpc/boot/cuboot-sequoia.c b/trunk/arch/powerpc/boot/cuboot-sequoia.c
index 66b7eeb82b46..f555575a44de 100644
--- a/trunk/arch/powerpc/boot/cuboot-sequoia.c
+++ b/trunk/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/trunk/arch/powerpc/boot/dts/rainier.dts b/trunk/arch/powerpc/boot/dts/rainier.dts
index f29169e886f3..cf1b95d1f14b 100644
--- a/trunk/arch/powerpc/boot/dts/rainier.dts
+++ b/trunk/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/trunk/arch/powerpc/boot/dts/sequoia.dts b/trunk/arch/powerpc/boot/dts/sequoia.dts
index b20e516287d1..0c078483601c 100644
--- a/trunk/arch/powerpc/boot/dts/sequoia.dts
+++ b/trunk/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>;
 		};