Commit d4e62648 authored by David S. Miller's avatar David S. Miller

Revert "net: ti cpsw ethernet: allow reading phy interface mode from DT"

This reverts commit d7559982.

It wasn't meant to be applied, commit
342b7b74 ("net: ti cpsw ethernet: set
IFCTL_A bit in MACCONTROL") was redone in such a way to make this
commit unnecessary.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9fbef059
...@@ -25,8 +25,6 @@ Required properties: ...@@ -25,8 +25,6 @@ Required properties:
- slave_reg_ofs : Specifies slave register offset - slave_reg_ofs : Specifies slave register offset
- sliver_reg_ofs : Specifies slave sliver register offset - sliver_reg_ofs : Specifies slave sliver register offset
- phy_id : Specifies slave phy id - phy_id : Specifies slave phy id
- phy_if_mode : Specified slave phy interface mode (optional)
(one of the PHY_INTERFACE_MODE_* as numerical value)
- mac-address : Specifies slave MAC address - mac-address : Specifies slave MAC address
Optional properties: Optional properties:
...@@ -64,7 +62,6 @@ Examples: ...@@ -64,7 +62,6 @@ Examples:
slave_reg_ofs = <0x208>; slave_reg_ofs = <0x208>;
sliver_reg_ofs = <0xd80>; sliver_reg_ofs = <0xd80>;
phy_id = "davinci_mdio.16:00"; phy_id = "davinci_mdio.16:00";
phy_if_mode = <6>; /* PHY_INTERFACE_MODE_RGMII */
/* Filled in by U-Boot */ /* Filled in by U-Boot */
mac-address = [ 00 00 00 00 00 00 ]; mac-address = [ 00 00 00 00 00 00 ];
}; };
......
...@@ -855,9 +855,6 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data, ...@@ -855,9 +855,6 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
} }
slave_data->sliver_reg_ofs = prop; slave_data->sliver_reg_ofs = prop;
if (!of_property_read_u32(slave_node, "phy_if_mode", &prop))
slave_data->phy_if = prop;
mac_addr = of_get_mac_address(slave_node); mac_addr = of_get_mac_address(slave_node);
if (mac_addr) if (mac_addr)
memcpy(slave_data->mac_addr, mac_addr, ETH_ALEN); memcpy(slave_data->mac_addr, mac_addr, ETH_ALEN);
......
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