From 47511b7a94c2757ccd62a638028d5ab82ca88f54 Mon Sep 17 00:00:00 2001
From: Deepak Sikri <deepak.sikri@st.com>
Date: Thu, 9 Aug 2012 13:18:40 +0530
Subject: [PATCH] --- yaml --- r: 344207 b: refs/heads/master c:
 4c7a078f9003f31862f3a194dfa6a2dcf0937b39 h: refs/heads/master i:   344205:
 ce74e2076d8e2b50b891beec96a6616f12a515f9   344203:
 1a5b67e0f105da20e5ed40f19d5ec1c390a978d4   344199:
 a41cf866c711c9679e287c56b8d04ce95d759ed0   344191:
 f2aeb19a4b3330dd08fbc4567064e882c4fd3ee3 v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/arm/boot/dts/spear1310-evb.dts | 1 +
 trunk/arch/arm/boot/dts/spear1310.dtsi    | 4 ++++
 trunk/arch/arm/boot/dts/spear1340-evb.dts | 1 +
 trunk/arch/arm/boot/dts/spear3xx.dtsi     | 1 +
 trunk/arch/arm/boot/dts/spear600.dtsi     | 1 +
 6 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5bb902a9ec77..65378f6b5c51 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f631b984ee104bb3979cd26311abbcd4d23a715d
+refs/heads/master: 4c7a078f9003f31862f3a194dfa6a2dcf0937b39
diff --git a/trunk/arch/arm/boot/dts/spear1310-evb.dts b/trunk/arch/arm/boot/dts/spear1310-evb.dts
index 668dcb27dafd..72f467575743 100644
--- a/trunk/arch/arm/boot/dts/spear1310-evb.dts
+++ b/trunk/arch/arm/boot/dts/spear1310-evb.dts
@@ -148,6 +148,7 @@
 		};
 
 		gmac0: eth@e2000000 {
+			phy-mode = "gmii";
 			status = "okay";
 		};
 
diff --git a/trunk/arch/arm/boot/dts/spear1310.dtsi b/trunk/arch/arm/boot/dts/spear1310.dtsi
index b2479be75905..e613452ec5bb 100644
--- a/trunk/arch/arm/boot/dts/spear1310.dtsi
+++ b/trunk/arch/arm/boot/dts/spear1310.dtsi
@@ -55,6 +55,7 @@
 			reg = <0x5c400000 0x8000>;
 			interrupts = <0 95 0x4>;
 			interrupt-names = "macirq";
+			phy-mode = "mii";
 			status = "disabled";
 		};
 
@@ -63,6 +64,7 @@
 			reg = <0x5c500000 0x8000>;
 			interrupts = <0 96 0x4>;
 			interrupt-names = "macirq";
+			phy-mode = "mii";
 			status = "disabled";
 		};
 
@@ -71,6 +73,7 @@
 			reg = <0x5c600000 0x8000>;
 			interrupts = <0 97 0x4>;
 			interrupt-names = "macirq";
+			phy-mode = "rmii";
 			status = "disabled";
 		};
 
@@ -79,6 +82,7 @@
 			reg = <0x5c700000 0x8000>;
 			interrupts = <0 98 0x4>;
 			interrupt-names = "macirq";
+			phy-mode = "rgmii";
 			status = "disabled";
 		};
 
diff --git a/trunk/arch/arm/boot/dts/spear1340-evb.dts b/trunk/arch/arm/boot/dts/spear1340-evb.dts
index 015601360f73..cfe82d126da3 100644
--- a/trunk/arch/arm/boot/dts/spear1340-evb.dts
+++ b/trunk/arch/arm/boot/dts/spear1340-evb.dts
@@ -156,6 +156,7 @@
 		};
 
 		gmac0: eth@e2000000 {
+			phy-mode = "rgmii";
 			status = "okay";
 		};
 
diff --git a/trunk/arch/arm/boot/dts/spear3xx.dtsi b/trunk/arch/arm/boot/dts/spear3xx.dtsi
index b02721fed166..494636000f5c 100644
--- a/trunk/arch/arm/boot/dts/spear3xx.dtsi
+++ b/trunk/arch/arm/boot/dts/spear3xx.dtsi
@@ -53,6 +53,7 @@
 			reg = <0xe0800000 0x8000>;
 			interrupts = <23 22>;
 			interrupt-names = "macirq", "eth_wake_irq";
+			phy-mode = "mii";
 			status = "disabled";
 		};
 
diff --git a/trunk/arch/arm/boot/dts/spear600.dtsi b/trunk/arch/arm/boot/dts/spear600.dtsi
index a3c36e47d7ef..f74feeaab1e0 100644
--- a/trunk/arch/arm/boot/dts/spear600.dtsi
+++ b/trunk/arch/arm/boot/dts/spear600.dtsi
@@ -59,6 +59,7 @@
 			interrupt-parent = <&vic1>;
 			interrupts = <24 23>;
 			interrupt-names = "macirq", "eth_wake_irq";
+			phy-mode = "gmii";
 			status = "disabled";
 		};