diff options
Diffstat (limited to 'drivers/net/ethernet/ti/keystone_ethss.c')
-rw-r--r-- | drivers/net/ethernet/ti/keystone_ethss.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/ethernet/ti/keystone_ethss.c b/drivers/net/ethernet/ti/keystone_ethss.c index 1e18fa4d27e..51a5bd7038e 100644 --- a/drivers/net/ethernet/ti/keystone_ethss.c +++ b/drivers/net/ethernet/ti/keystone_ethss.c | |||
@@ -161,6 +161,9 @@ | |||
161 | #define SGMII_BASE(s) \ | 161 | #define SGMII_BASE(s) \ |
162 | (((s) < 2) ? cpsw_dev->sgmii_port_regs : cpsw_dev->sgmii_port34_regs) | 162 | (((s) < 2) ? cpsw_dev->sgmii_port_regs : cpsw_dev->sgmii_port34_regs) |
163 | 163 | ||
164 | #define IS_SGMII_MAC_PHY(i) \ | ||
165 | (((i) == SGMII_LINK_MAC_PHY) || ((i) == SGMII_LINK_MAC_PHY_MASTER)) | ||
166 | |||
164 | /* CPSW SERDES */ | 167 | /* CPSW SERDES */ |
165 | #define CPSW_SERDES_MAX_NUM 1 | 168 | #define CPSW_SERDES_MAX_NUM 1 |
166 | #define CPSW_LANE_NUM_PER_SERDES 4 | 169 | #define CPSW_LANE_NUM_PER_SERDES 4 |
@@ -2223,7 +2226,7 @@ static void cpsw_slave_link(struct cpsw_slave *slave, | |||
2223 | struct netcp_priv *netcp = netdev_priv(cpsw_intf->ndev); | 2226 | struct netcp_priv *netcp = netdev_priv(cpsw_intf->ndev); |
2224 | int sn = slave->slave_num; | 2227 | int sn = slave->slave_num; |
2225 | 2228 | ||
2226 | if (slave->link_interface == SGMII_LINK_MAC_PHY) { | 2229 | if (IS_SGMII_MAC_PHY(slave->link_interface)) { |
2227 | /* check only the bit in phy_link_state_mask | 2230 | /* check only the bit in phy_link_state_mask |
2228 | * that corresponds to the slave | 2231 | * that corresponds to the slave |
2229 | */ | 2232 | */ |
@@ -2271,7 +2274,7 @@ static void cpsw_slave_open(struct cpsw_slave *slave, | |||
2271 | cpsw_ale_add_mcast(priv->ale, cpsw_intf->ndev->broadcast, | 2274 | cpsw_ale_add_mcast(priv->ale, cpsw_intf->ndev->broadcast, |
2272 | 1 << slave_port, 0, 0, ALE_MCAST_FWD_2); | 2275 | 1 << slave_port, 0, 0, ALE_MCAST_FWD_2); |
2273 | 2276 | ||
2274 | if (slave->link_interface == SGMII_LINK_MAC_PHY) { | 2277 | if (IS_SGMII_MAC_PHY(slave->link_interface)) { |
2275 | slave->phy = of_phy_connect(cpsw_intf->ndev, | 2278 | slave->phy = of_phy_connect(cpsw_intf->ndev, |
2276 | cpsw_intf->phy_node, | 2279 | cpsw_intf->phy_node, |
2277 | &cpsw_adjust_link, 0, | 2280 | &cpsw_adjust_link, 0, |
@@ -2683,7 +2686,7 @@ static void cpsw_timer(unsigned long arg) | |||
2683 | */ | 2686 | */ |
2684 | if (!cpsw_dev->multi_if || | 2687 | if (!cpsw_dev->multi_if || |
2685 | (cpsw_dev->multi_if && | 2688 | (cpsw_dev->multi_if && |
2686 | cpsw_intf->slaves->link_interface != SGMII_LINK_MAC_PHY)) { | 2689 | !IS_SGMII_MAC_PHY(cpsw_intf->slaves->link_interface))) { |
2687 | if (cpsw_intf->link_state) | 2690 | if (cpsw_intf->link_state) |
2688 | netif_carrier_on(cpsw_intf->ndev); | 2691 | netif_carrier_on(cpsw_intf->ndev); |
2689 | else | 2692 | else |