summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2008-04-03 15:35:06 +0200
committerJosh Boyer <jwboyer@linux.vnet.ibm.com>2008-04-05 16:32:32 +0200
commita6190a84ab1163f750fcd1511bd96f7803724cd3 (patch)
treed8f5092ae636932994faa6ecfa4aa1a3e8e4ba63
parent[POWERPC] 4xx: Create common ppc4xx_reset_system() in ppc4xx_soc.c (diff)
downloadlinux-a6190a84ab1163f750fcd1511bd96f7803724cd3.tar.xz
linux-a6190a84ab1163f750fcd1511bd96f7803724cd3.zip
[POWERPC] 4xx: Some EMAC related changes in Canyonlands & Glacier dts files
This patch fixes some problems in the Canyonlands 460EX and Glacier 460GT dts files: - Add "mdio-device = <&EMAC0>" to all all EMAC's except for EMAC0 itself (the 460EX/GT only can access the PHY via the EMAC0 instance) - Add TAH support to Canyonlands dts Signed-off-by: Stefan Roese <sr@denx.de> Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
-rw-r--r--arch/powerpc/boot/dts/canyonlands.dts19
-rw-r--r--arch/powerpc/boot/dts/glacier.dts5
2 files changed, 19 insertions, 5 deletions
diff --git a/arch/powerpc/boot/dts/canyonlands.dts b/arch/powerpc/boot/dts/canyonlands.dts
index 657f2b4d3b1b..6f3d38a1554f 100644
--- a/arch/powerpc/boot/dts/canyonlands.dts
+++ b/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/arch/powerpc/boot/dts/glacier.dts b/arch/powerpc/boot/dts/glacier.dts
index 7a7c9bfa0211..958a5ca53d35 100644
--- a/arch/powerpc/boot/dts/glacier.dts
+++ b/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>;
};
};