Commit a6190a84 authored by Stefan Roese's avatar Stefan Roese Committed by Josh Boyer

[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: default avatarStefan Roese <sr@denx.de>
Signed-off-by: default avatarJosh Boyer <jwboyer@linux.vnet.ibm.com>
parent 93173ce2
...@@ -215,6 +215,16 @@ RGMII0: emac-rgmii@ef601500 { ...@@ -215,6 +215,16 @@ RGMII0: emac-rgmii@ef601500 {
has-mdio; 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 { EMAC0: ethernet@ef600e00 {
device_type = "network"; device_type = "network";
compatible = "ibm,emac-460ex", "ibm,emac4"; compatible = "ibm,emac-460ex", "ibm,emac4";
...@@ -236,10 +246,10 @@ EMAC0: ethernet@ef600e00 { ...@@ -236,10 +246,10 @@ EMAC0: ethernet@ef600e00 {
tx-fifo-size = <800>; tx-fifo-size = <800>;
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-map = <00000000>; phy-map = <00000000>;
zmii-device = <&ZMII0>;
zmii-channel = <0>;
rgmii-device = <&RGMII0>; rgmii-device = <&RGMII0>;
rgmii-channel = <0>; rgmii-channel = <0>;
tah-device = <&TAH0>;
tah-channel = <0>;
has-inverted-stacr-oc; has-inverted-stacr-oc;
has-new-stacr-staopc; has-new-stacr-staopc;
}; };
...@@ -265,12 +275,13 @@ EMAC1: ethernet@ef600f00 { ...@@ -265,12 +275,13 @@ EMAC1: ethernet@ef600f00 {
tx-fifo-size = <800>; tx-fifo-size = <800>;
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-map = <00000000>; phy-map = <00000000>;
zmii-device = <&ZMII0>;
zmii-channel = <1>;
rgmii-device = <&RGMII0>; rgmii-device = <&RGMII0>;
rgmii-channel = <1>; rgmii-channel = <1>;
tah-device = <&TAH1>;
tah-channel = <1>;
has-inverted-stacr-oc; has-inverted-stacr-oc;
has-new-stacr-staopc; has-new-stacr-staopc;
mdio-device = <&EMAC0>;
}; };
}; };
......
...@@ -287,9 +287,10 @@ EMAC1: ethernet@ef600f00 { ...@@ -287,9 +287,10 @@ EMAC1: ethernet@ef600f00 {
rgmii-device = <&RGMII0>; rgmii-device = <&RGMII0>;
rgmii-channel = <1>; rgmii-channel = <1>;
tah-device = <&TAH1>; tah-device = <&TAH1>;
tah-channel = <0>; tah-channel = <1>;
has-inverted-stacr-oc; has-inverted-stacr-oc;
has-new-stacr-staopc; has-new-stacr-staopc;
mdio-device = <&EMAC0>;
}; };
EMAC2: ethernet@ef601100 { EMAC2: ethernet@ef601100 {
...@@ -317,6 +318,7 @@ EMAC2: ethernet@ef601100 { ...@@ -317,6 +318,7 @@ EMAC2: ethernet@ef601100 {
rgmii-channel = <0>; rgmii-channel = <0>;
has-inverted-stacr-oc; has-inverted-stacr-oc;
has-new-stacr-staopc; has-new-stacr-staopc;
mdio-device = <&EMAC0>;
}; };
EMAC3: ethernet@ef601200 { EMAC3: ethernet@ef601200 {
...@@ -344,6 +346,7 @@ EMAC3: ethernet@ef601200 { ...@@ -344,6 +346,7 @@ EMAC3: ethernet@ef601200 {
rgmii-channel = <1>; rgmii-channel = <1>;
has-inverted-stacr-oc; has-inverted-stacr-oc;
has-new-stacr-staopc; has-new-stacr-staopc;
mdio-device = <&EMAC0>;
}; };
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment