Commit 299752a7 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller

net: dsa: b53: Make b53_enable_cpu_port() take a port argument

In preparation for future changes allowing the configuring of multiple
CPU ports, make b53_enable_cpu_port() take a port argument.
Reviewed-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7131cc9f
...@@ -538,19 +538,18 @@ static void b53_disable_port(struct dsa_switch *ds, int port, ...@@ -538,19 +538,18 @@ static void b53_disable_port(struct dsa_switch *ds, int port,
b53_write8(dev, B53_CTRL_PAGE, B53_PORT_CTRL(port), reg); b53_write8(dev, B53_CTRL_PAGE, B53_PORT_CTRL(port), reg);
} }
static void b53_enable_cpu_port(struct b53_device *dev) static void b53_enable_cpu_port(struct b53_device *dev, int port)
{ {
unsigned int cpu_port = dev->cpu_port;
u8 port_ctrl; u8 port_ctrl;
/* BCM5325 CPU port is at 8 */ /* BCM5325 CPU port is at 8 */
if ((is5325(dev) || is5365(dev)) && cpu_port == B53_CPU_PORT_25) if ((is5325(dev) || is5365(dev)) && port == B53_CPU_PORT_25)
cpu_port = B53_CPU_PORT; port = B53_CPU_PORT;
port_ctrl = PORT_CTRL_RX_BCST_EN | port_ctrl = PORT_CTRL_RX_BCST_EN |
PORT_CTRL_RX_MCST_EN | PORT_CTRL_RX_MCST_EN |
PORT_CTRL_RX_UCST_EN; PORT_CTRL_RX_UCST_EN;
b53_write8(dev, B53_CTRL_PAGE, B53_PORT_CTRL(cpu_port), port_ctrl); b53_write8(dev, B53_CTRL_PAGE, B53_PORT_CTRL(port), port_ctrl);
} }
static void b53_enable_mib(struct b53_device *dev) static void b53_enable_mib(struct b53_device *dev)
...@@ -820,7 +819,7 @@ static int b53_setup(struct dsa_switch *ds) ...@@ -820,7 +819,7 @@ static int b53_setup(struct dsa_switch *ds)
if (BIT(port) & ds->enabled_port_mask) if (BIT(port) & ds->enabled_port_mask)
b53_enable_port(ds, port, NULL); b53_enable_port(ds, port, NULL);
else if (dsa_is_cpu_port(ds, port)) else if (dsa_is_cpu_port(ds, port))
b53_enable_cpu_port(dev); b53_enable_cpu_port(dev, port);
else else
b53_disable_port(ds, port, NULL); b53_disable_port(ds, port, NULL);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment