Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d65da4a authored by Guenter Roeck's avatar Guenter Roeck Committed by David S. Miller
Browse files

net: dsa: mv88e6131: Use common initialization functions 



Common initialization functions will be needed to enable
HW bridging support.

Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 05e8bb86

drivers/net/dsa/mv88e6131.c

+5 −28
Original line number Diff line number Diff line
@@ -208,28 +208,6 @@ static int mv88e6131_setup_port(struct dsa_switch *ds, int p) 
		val |= 0x0100;

	REG_WRITE(addr, 0x04, val);



	/* Port Control 1: disable trunking.  Also, if this is the

	 * CPU port, enable learn messages to be sent to this port.

	 */

	REG_WRITE(addr, 0x05, dsa_is_cpu_port(ds, p) ? 0x8000 : 0x0000);



	/* Port based VLAN map: give each port its own address

	 * database, allow the CPU port to talk to each of the 'real'

	 * ports, and allow each of the 'real' ports to only talk to

	 * the upstream port.

	 */

	val = (p & 0xf) << 12;

	if (dsa_is_cpu_port(ds, p))

		val |= ds->phys_port_mask;

	else

		val |= 1 << dsa_upstream_port(ds);

	REG_WRITE(addr, 0x06, val);



	/* Default VLAN ID and priority: don't set a default VLAN

	 * ID, and set the default packet priority to zero.

	 */

	REG_WRITE(addr, 0x07, 0x0000);



	/* Port Control 2: don't force a good FCS, don't use

	 * VLAN-based, source address-based or destination

	 * address-based priority overrides, don't let the switch
@@ -278,20 +256,19 @@ static int mv88e6131_setup_port(struct dsa_switch *ds, int p) 
	 */

	REG_WRITE(addr, 0x19, 0x7654);



	return 0;

	return mv88e6xxx_setup_port_common(ds, p);

}



static int mv88e6131_setup(struct dsa_switch *ds)

{

	struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

	int i;

	int ret;



	mutex_init(&ps->smi_mutex);

	mv88e6xxx_ppu_state_init(ds);

	mutex_init(&ps->stats_mutex);

	ret = mv88e6xxx_setup_common(ds);

	if (ret < 0)

		return ret;



	ps->id = REG_READ(REG_PORT(0), 0x03) & 0xfff0;

	mv88e6xxx_ppu_state_init(ds);



	ret = mv88e6131_switch_reset(ds);

	if (ret < 0)