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

This reverts commit d7559982701ac500662b2e8e150ff34f7faf0281.

It wasn't meant to be applied, commit
342b7b741d76bc8aadeff844634348bb2a343d19 ("net: ti cpsw ethernet: set
IFCTL_A bit in MACCONTROL") was redone in such a way to make this
commit unnecessary.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/Documentation/devicetree/bindings/net/cpsw.txt b/Documentation/devicetree/bindings/net/cpsw.txt
index d87f7d2b7b0a9c2cc01dab0ec40f5bb9d31ad27b..dcaabe9fe869d7f029f413d6d97335549974fd05 100644 (file)
--- a/Documentation/devicetree/bindings/net/cpsw.txt
+++ b/Documentation/devicetree/bindings/net/cpsw.txt
@@ -25,8 +25,6 @@ Required properties:
 - slave_reg_ofs                : Specifies slave register offset
 - sliver_reg_ofs       : Specifies slave sliver register offset
 - 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
 
 Optional properties:
@@ -64,7 +62,6 @@ Examples:
                        slave_reg_ofs = <0x208>;
                        sliver_reg_ofs = <0xd80>;
                        phy_id = "davinci_mdio.16:00";
-                       phy_if_mode = <6>; /* PHY_INTERFACE_MODE_RGMII */
                        /* Filled in by U-Boot */
                        mac-address = [ 00 00 00 00 00 00 ];
                };

diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 3e12db6f9c0ca0a752a68ecfea22e755cd4b9498..df55e240374646e2f076d9b4764fab6dc0a07bab 100644 (file)
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -855,9 +855,6 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
                }
                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);
                if (mac_addr)
                        memcpy(slave_data->mac_addr, mac_addr, ETH_ALEN);