2 files changed, 8 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/net/cpsw.txt b/Documentation/devicetree/bindings/net/cpsw.txt
index 4f2ca6b4a182..05d660e4ac64 100644
--- a/Documentation/devicetree/bindings/net/cpsw.txt
+++ b/Documentation/devicetree/bindings/net/cpsw.txt
@@ -28,6 +28,8 @@ Optional properties:
 Slave Properties:
 Required properties:
 - phy_id                : Specifies slave phy id
+- phy-mode              : The interface between the SoC and the PHY (a string
+                          that of_get_phy_mode() can understand)
 - mac-address           : Specifies slave MAC address
 
 Optional properties:
@@ -58,11 +60,13 @@ Examples:
                 cpts_clock_shift = <29>;
                 cpsw_emac0: slave@0 {
                         phy_id = <&davinci_mdio>, <0>;
+                        phy-mode = "rgmii-txid";
                         /* Filled in by U-Boot */
                         mac-address = [ 00 00 00 00 00 00 ];
                 };
                 cpsw_emac1: slave@1 {
                         phy_id = <&davinci_mdio>, <1>;
+                        phy-mode = "rgmii-txid";
                         /* Filled in by U-Boot */
                         mac-address = [ 00 00 00 00 00 00 ];
                 };
@@ -84,11 +88,13 @@ Examples:
                 cpts_clock_shift = <29>;
                 cpsw_emac0: slave@0 {
                         phy_id = <&davinci_mdio>, <0>;
+                        phy-mode = "rgmii-txid";
                         /* Filled in by U-Boot */
                         mac-address = [ 00 00 00 00 00 00 ];
                 };
                 cpsw_emac1: slave@1 {
                         phy_id = <&davinci_mdio>, <1>;
+                        phy-mode = "rgmii-txid";
                         /* 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 89a4c40d6d83..a45f64eef870 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -1554,6 +1554,8 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
                 if (mac_addr)
                         memcpy(slave_data->mac_addr, mac_addr, ETH_ALEN);
 
+                slave_data->phy_if = of_get_phy_mode(slave_node);
+
                 if (data->dual_emac) {
                         if (of_property_read_u32(slave_node, "dual_emac_res_vlan",
                                                  &prop)) {