net: netcp: ethss: make sgmii configuration conditional

As a preparatory patch to add support for 2u cpsw hardware found on
K2G SoC, make sgmii configuration conditional. This is required
since 2u uses RGMII interface instead of SGMII and to allow for driver
re-use.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/ti/netcp_ethss.c b/drivers/net/ethernet/ti/netcp_ethss.c
index 1b79fe51c747aa3cd9481a05d7c9688e05afc3f3..e1e67ff9eb86ae932a45fd2f8c44d4cac7e5e02a 100644 (file)
--- a/drivers/net/ethernet/ti/netcp_ethss.c
+++ b/drivers/net/ethernet/ti/netcp_ethss.c
@@ -74,6 +74,8 @@
 
 #define IS_SS_ID_VER_14(d) \
        (GBE_IDENT((d)->ss_version) == GBE_SS_VERSION_14)
+#define IS_SS_ID_2U(d) \
+       (GBE_IDENT((d)->ss_version) == GBE_SS_ID_2U)
 
 #define GBENU_SS_REG_INDEX             0
 #define GBENU_SM_REG_INDEX             1
@@ -2239,7 +2241,8 @@ static void gbe_slave_stop(struct gbe_intf *intf)
        struct gbe_priv *gbe_dev = intf->gbe_dev;
        struct gbe_slave *slave = intf->slave;
 
-       gbe_sgmii_rtreset(gbe_dev, slave, true);
+       if (!IS_SS_ID_2U(gbe_dev))
+               gbe_sgmii_rtreset(gbe_dev, slave, true);
        gbe_port_reset(slave);
        /* Disable forwarding */
        cpsw_ale_control_set(gbe_dev->ale, slave->port_num,
@@ -2274,9 +2277,11 @@ static int gbe_slave_open(struct gbe_intf *gbe_intf)
 
        void (*hndlr)(struct net_device *) = gbe_adjust_link;
 
-       gbe_sgmii_config(priv, slave);
+       if (!IS_SS_ID_2U(priv))
+               gbe_sgmii_config(priv, slave);
        gbe_port_reset(slave);
-       gbe_sgmii_rtreset(priv, slave, false);
+       if (!IS_SS_ID_2U(priv))
+               gbe_sgmii_rtreset(priv, slave, false);
        gbe_port_config(priv, slave, priv->rx_packet_max);
        gbe_set_slave_mac(slave, gbe_intf);
        /* enable forwarding */
@@ -3042,7 +3047,8 @@ static void init_secondary_ports(struct gbe_priv *gbe_dev,
                        continue;
                }
 
-               gbe_sgmii_config(gbe_dev, slave);
+               if (!IS_SS_ID_2U(gbe_dev))
+                       gbe_sgmii_config(gbe_dev, slave);
                gbe_port_reset(slave);
                gbe_port_config(gbe_dev, slave, gbe_dev->rx_packet_max);
                list_add_tail(&slave->slave_list, &gbe_dev->secondary_slaves);
@@ -3399,7 +3405,9 @@ static int set_gbenu_ethss_priv(struct gbe_priv *gbe_dev,
        }
        gbe_dev->switch_regs = regs;
 
-       gbe_dev->sgmii_port_regs = gbe_dev->ss_regs + GBENU_SGMII_MODULE_OFFSET;
+       if (!IS_SS_ID_2U(gbe_dev))
+               gbe_dev->sgmii_port_regs =
+                      gbe_dev->ss_regs + GBENU_SGMII_MODULE_OFFSET;
 
        /* Although sgmii modules are mem mapped to one contiguous
         * region on GBENU devices, setting sgmii_port34_regs allows