diff options
| author |   Vladimir Oltean <vladimir.oltean@nxp.com> | 2019-11-14 17:03:26 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-11-15 12:32:16 -0800 |
| commit | 3a77b5933fdb2ea4a9c7cdd9bd9b65b6fd23626e (patch) | |
| tree | bbec6b11112a20223f5746b43299d40eb5e523fa /drivers/net/ethernet/mscc/ocelot.c | |
| parent | net: mscc: ocelot: adjust MTU on the CPU port in NPI mode (diff) | |
| download | linux-dev-3a77b5933fdb2ea4a9c7cdd9bd9b65b6fd23626e.tar.xz linux-dev-3a77b5933fdb2ea4a9c7cdd9bd9b65b6fd23626e.zip | |
net: mscc: ocelot: separate the implementation of switch reset
The Felix switch has a different reset procedure, so a function pointer
needs to be created and added to the ocelot_ops structure.
The reset procedure has been moved into ocelot_init.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mscc/ocelot.c')
| -rw-r--r-- | drivers/net/ethernet/mscc/ocelot.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c index 42da193a8240..961f9a7c01e3 100644 --- a/drivers/net/ethernet/mscc/ocelot.c +++ b/drivers/net/ethernet/mscc/ocelot.c @@ -2269,6 +2269,14 @@ int ocelot_init(struct ocelot *ocelot) int i, ret; u32 port; + if (ocelot->ops->reset) { + ret = ocelot->ops->reset(ocelot); + if (ret) { + dev_err(ocelot->dev, "Switch reset failed\n"); + return ret; + } + } + ocelot->lags = devm_kcalloc(ocelot->dev, ocelot->num_phys_ports, sizeof(u32), GFP_KERNEL); if (!ocelot->lags) |