tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
-6
-3
Documentation/devicetree/bindings/net/cpsw.txt
-3
Documentation/devicetree/bindings/net/cpsw.txt
···
25
25
- slave_reg_ofs : Specifies slave register offset
26
26
- sliver_reg_ofs : Specifies slave sliver register offset
27
27
- 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)
30
28
- mac-address : Specifies slave MAC address
31
29
32
30
Optional properties:
···
62
64
slave_reg_ofs = <0x208>;
63
65
sliver_reg_ofs = <0xd80>;
64
66
phy_id = "davinci_mdio.16:00";
65
-
phy_if_mode = <6>; /* PHY_INTERFACE_MODE_RGMII */
66
67
/* Filled in by U-Boot */
67
68
mac-address = [ 00 00 00 00 00 00 ];
68
69
};
-3
drivers/net/ethernet/ti/cpsw.c
-3
drivers/net/ethernet/ti/cpsw.c
···
855
855
}
856
856
slave_data->sliver_reg_ofs = prop;
857
857
858
-
if (!of_property_read_u32(slave_node, "phy_if_mode", &prop))
859
-
slave_data->phy_if = prop;
860
-
861
858
mac_addr = of_get_mac_address(slave_node);
862
859
if (mac_addr)
863
860
memcpy(slave_data->mac_addr, mac_addr, ETH_ALEN);