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

Commit 2089052f authored by Guenter Roeck's avatar Guenter Roeck Committed by David S. Miller
Browse files

net: dsa: mv88e6352: Use common port initialization code 



This prepares the driver for hardware bridging.

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

drivers/net/dsa/mv88e6352.c

+1 −23
Original line number Original line Diff line number Diff line
@@ -215,28 +215,6 @@ static int mv88e6352_setup_port(struct dsa_switch *ds, int p) 
		val |= 0x000c;

		val |= 0x000c;

	REG_WRITE(addr, 0x04, val);

	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, set the maximum

	/* Port Control 2: don't force a good FCS, set the maximum

	 * frame size to 10240 bytes, don't let the switch add or

	 * frame size to 10240 bytes, don't let the switch add or

	 * strip 802.1q tags, don't discard tagged or untagged frames

	 * strip 802.1q tags, don't discard tagged or untagged frames
@@ -281,7 +259,7 @@ static int mv88e6352_setup_port(struct dsa_switch *ds, int p) 
	 */

	 */

	REG_WRITE(addr, 0x19, 0x7654);

	REG_WRITE(addr, 0x19, 0x7654);





	return 0;

	return mv88e6xxx_setup_port_common(ds, p);

}

}





#ifdef CONFIG_NET_DSA_HWMON

#ifdef CONFIG_NET_DSA_HWMON