aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/ti/cpsw_priv.c
diff options
context:
space:
mode:
authorGrygorii Strashko <grygorii.strashko@ti.com>2019-04-26 20:12:41 +0300
committerDavid S. Miller <davem@davemloft.net>2019-04-27 17:11:49 -0400
commitcfc08345ec2201a67d5511fa90831b79f5183dda (patch)
treea907bb8504753ac3e5c2ea023750b26c9857b3a4 /drivers/net/ethernet/ti/cpsw_priv.c
parentnet: ethernet: ti: cpsw: introduce mac sl module api (diff)
downloadlinux-dev-cfc08345ec2201a67d5511fa90831b79f5183dda.tar.xz
linux-dev-cfc08345ec2201a67d5511fa90831b79f5183dda.zip
net: ethernet: ti: cpsw: switch to use mac sl api
Switch CPSW driver to use the new MAC SL API. Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ti/cpsw_priv.c')
-rw-r--r--drivers/net/ethernet/ti/cpsw_priv.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ti/cpsw_priv.c b/drivers/net/ethernet/ti/cpsw_priv.c
index d4d1e0b397bc..476d050a022c 100644
--- a/drivers/net/ethernet/ti/cpsw_priv.c
+++ b/drivers/net/ethernet/ti/cpsw_priv.c
@@ -16,6 +16,7 @@
#include "cpts.h"
#include "cpsw_ale.h"
#include "cpsw_priv.h"
+#include "cpsw_sl.h"
#include "davinci_cpdma.h"
int cpsw_init_common(struct cpsw_common *cpsw, void __iomem *ss_regs,
@@ -78,8 +79,10 @@ int cpsw_init_common(struct cpsw_common *cpsw, void __iomem *ss_regs,
slave->slave_num = i;
slave->data = &cpsw->data.slave_data[i];
slave->regs = regs + slave_offset;
- slave->sliver = regs + sliver_offset;
slave->port_vlan = slave->data->dual_emac_res_vlan;
+ slave->mac_sl = cpsw_sl_get("cpsw", dev, regs + sliver_offset);
+ if (IS_ERR(slave->mac_sl))
+ return PTR_ERR(slave->mac_sl);
slave_offset += slave_size;
sliver_offset += SLIVER_SIZE;