diff options
-rw-r--r-- | Documentation/devicetree/bindings/net/cpsw.txt | 3 | ||||
-rw-r--r-- | drivers/net/ethernet/ti/cpsw.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/net/cpsw.txt b/Documentation/devicetree/bindings/net/cpsw.txt index dcaabe9fe869..d87f7d2b7b0a 100644 --- a/Documentation/devicetree/bindings/net/cpsw.txt +++ b/Documentation/devicetree/bindings/net/cpsw.txt | |||
@@ -25,6 +25,8 @@ Required properties: | |||
25 | - slave_reg_ofs : Specifies slave register offset | 25 | - slave_reg_ofs : Specifies slave register offset |
26 | - sliver_reg_ofs : Specifies slave sliver register offset | 26 | - sliver_reg_ofs : Specifies slave sliver register offset |
27 | - phy_id : Specifies slave phy id | 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) | ||
28 | - mac-address : Specifies slave MAC address | 30 | - mac-address : Specifies slave MAC address |
29 | 31 | ||
30 | Optional properties: | 32 | Optional properties: |
@@ -62,6 +64,7 @@ Examples: | |||
62 | slave_reg_ofs = <0x208>; | 64 | slave_reg_ofs = <0x208>; |
63 | sliver_reg_ofs = <0xd80>; | 65 | sliver_reg_ofs = <0xd80>; |
64 | phy_id = "davinci_mdio.16:00"; | 66 | phy_id = "davinci_mdio.16:00"; |
67 | phy_if_mode = <6>; /* PHY_INTERFACE_MODE_RGMII */ | ||
65 | /* Filled in by U-Boot */ | 68 | /* Filled in by U-Boot */ |
66 | mac-address = [ 00 00 00 00 00 00 ]; | 69 | mac-address = [ 00 00 00 00 00 00 ]; |
67 | }; | 70 | }; |
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index df55e2403746..3e12db6f9c0c 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c | |||
@@ -855,6 +855,9 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data, | |||
855 | } | 855 | } |
856 | slave_data->sliver_reg_ofs = prop; | 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 | |||
858 | mac_addr = of_get_mac_address(slave_node); | 861 | mac_addr = of_get_mac_address(slave_node); |
859 | if (mac_addr) | 862 | if (mac_addr) |
860 | memcpy(slave_data->mac_addr, mac_addr, ETH_ALEN); | 863 | memcpy(slave_data->mac_addr, mac_addr, ETH_ALEN); |