From 0d70f12211fc7d46926c8f7a57a331259fcfbeae Mon Sep 17 00:00:00 2001
From: Stefan Roese <sr@denx.de>
Date: Fri, 4 Apr 2008 00:35:06 +1100
Subject: [PATCH] --- yaml --- r: 91503 b: refs/heads/master c:
 a6190a84ab1163f750fcd1511bd96f7803724cd3 h: refs/heads/master i:   91501:
 111d59b5952805a5902a00d28c7be48ce1efa12d   91499:
 96d97a794e6a0e0e1801a885bf50a4caa7698e4e   91495:
 df390c002132a979fb1cc0b817e7ab20df72012f   91487:
 1065a9fb858de8349099c46b9d9d6da799b1e606 v: v3

---
 [refs]                                      |  2 +-
 trunk/arch/powerpc/boot/dts/canyonlands.dts | 19 +++++++++++++++----
 trunk/arch/powerpc/boot/dts/glacier.dts     |  5 ++++-
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 4e3ad9e9cbe7..33d00bb53ee5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93173ce272e54f81460986ff5040d16ab79488a9
+refs/heads/master: a6190a84ab1163f750fcd1511bd96f7803724cd3
diff --git a/trunk/arch/powerpc/boot/dts/canyonlands.dts b/trunk/arch/powerpc/boot/dts/canyonlands.dts
index 657f2b4d3b1b..6f3d38a1554f 100644
--- a/trunk/arch/powerpc/boot/dts/canyonlands.dts
+++ b/trunk/arch/powerpc/boot/dts/canyonlands.dts
@@ -215,6 +215,16 @@
 				has-mdio;
 			};
 
+			TAH0: emac-tah@ef601350 {
+				compatible = "ibm,tah-460ex", "ibm,tah";
+				reg = <ef601350 30>;
+			};
+
+			TAH1: emac-tah@ef601450 {
+				compatible = "ibm,tah-460ex", "ibm,tah";
+				reg = <ef601450 30>;
+			};
+
 			EMAC0: ethernet@ef600e00 {
 				device_type = "network";
 				compatible = "ibm,emac-460ex", "ibm,emac4";
@@ -236,10 +246,10 @@
 				tx-fifo-size = <800>;
 				phy-mode = "rgmii";
 				phy-map = <00000000>;
-				zmii-device = <&ZMII0>;
-				zmii-channel = <0>;
 				rgmii-device = <&RGMII0>;
 				rgmii-channel = <0>;
+				tah-device = <&TAH0>;
+				tah-channel = <0>;
 				has-inverted-stacr-oc;
 				has-new-stacr-staopc;
 			};
@@ -265,12 +275,13 @@
 				tx-fifo-size = <800>;
 				phy-mode = "rgmii";
 				phy-map = <00000000>;
-				zmii-device = <&ZMII0>;
-				zmii-channel = <1>;
 				rgmii-device = <&RGMII0>;
 				rgmii-channel = <1>;
+				tah-device = <&TAH1>;
+				tah-channel = <1>;
 				has-inverted-stacr-oc;
 				has-new-stacr-staopc;
+				mdio-device = <&EMAC0>;
 			};
 		};
 
diff --git a/trunk/arch/powerpc/boot/dts/glacier.dts b/trunk/arch/powerpc/boot/dts/glacier.dts
index 7a7c9bfa0211..958a5ca53d35 100644
--- a/trunk/arch/powerpc/boot/dts/glacier.dts
+++ b/trunk/arch/powerpc/boot/dts/glacier.dts
@@ -287,9 +287,10 @@
 				rgmii-device = <&RGMII0>;
 				rgmii-channel = <1>;
 				tah-device = <&TAH1>;
-				tah-channel = <0>;
+				tah-channel = <1>;
 				has-inverted-stacr-oc;
 				has-new-stacr-staopc;
+				mdio-device = <&EMAC0>;
 			};
 
 			EMAC2: ethernet@ef601100 {
@@ -317,6 +318,7 @@
 				rgmii-channel = <0>;
 				has-inverted-stacr-oc;
 				has-new-stacr-staopc;
+				mdio-device = <&EMAC0>;
 			};
 
 			EMAC3: ethernet@ef601200 {
@@ -344,6 +346,7 @@
 				rgmii-channel = <1>;
 				has-inverted-stacr-oc;
 				has-new-stacr-staopc;
+				mdio-device = <&EMAC0>;
 			};
 		};