diff options
| author | David S. Miller <davem@davemloft.net> | 2012-10-02 01:39:31 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-10-02 01:39:31 +0400 |
| commit | d4e62648274857a2b3a5bc62f910c062e71b2d9b (patch) | |
| tree | 577ae52418806cbc94d16fde5fe6197b16d7b13f | |
| parent | 9fbef059d63cbc3249a3ddfd9a12cb511c8be55e (diff) | |
| download | linux-d4e62648274857a2b3a5bc62f910c062e71b2d9b.tar.xz | |
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>
| -rw-r--r-- | Documentation/devicetree/bindings/net/cpsw.txt | 3 | ||||
| -rw-r--r-- | drivers/net/ethernet/ti/cpsw.c | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/Documentation/devicetree/bindings/net/cpsw.txt b/Documentation/devicetree/bindings/net/cpsw.txt index d87f7d2b7b0a..dcaabe9fe869 100644 --- 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 3e12db6f9c0c..df55e2403746 100644 --- 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); |