Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Documentation/devicetree/bindings/net/cpsw.txt

+0 −3
Original line number Diff line number Diff line
@@ -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 ];

		};

drivers/net/ethernet/ti/cpsw.c

+0 −3
Original line number Diff line number Diff line
@@ -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);