Skip to content

Commit d4e6264

Browse files
committed
Revert "net: ti cpsw ethernet: allow reading phy interface mode from DT"
This reverts commit d755998. It wasn't meant to be applied, commit 342b7b7 ("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 <[email protected]>
1 parent 9fbef05 commit d4e6264

File tree

2 files changed

+0
-6
lines changed
  • Documentation/devicetree/bindings/net
  • drivers/net/ethernet/ti

2 files changed

+0
-6
lines changed

Documentation/devicetree/bindings/net/cpsw.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ Required properties:
2525
- slave_reg_ofs : Specifies slave register offset
2626
- sliver_reg_ofs : Specifies slave sliver register offset
2727
- phy_id : Specifies slave phy id
28-
- phy_if_mode : Specified slave phy interface mode (optional)
29-
(one of the PHY_INTERFACE_MODE_* as numerical value)
3028
- mac-address : Specifies slave MAC address
3129

3230
Optional properties:
@@ -64,7 +62,6 @@ Examples:
6462
slave_reg_ofs = <0x208>;
6563
sliver_reg_ofs = <0xd80>;
6664
phy_id = "davinci_mdio.16:00";
67-
phy_if_mode = <6>; /* PHY_INTERFACE_MODE_RGMII */
6865
/* Filled in by U-Boot */
6966
mac-address = [ 00 00 00 00 00 00 ];
7067
};

drivers/net/ethernet/ti/cpsw.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -855,9 +855,6 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
855855
}
856856
slave_data->sliver_reg_ofs = prop;
857857

858-
if (!of_property_read_u32(slave_node, "phy_if_mode", &prop))
859-
slave_data->phy_if = prop;
860-
861858
mac_addr = of_get_mac_address(slave_node);
862859
if (mac_addr)
863860
memcpy(slave_data->mac_addr, mac_addr, ETH_ALEN);

0 commit comments

Comments
 (0)