Commit fb9324be authored by Arun Ramadoss's avatar Arun Ramadoss Committed by David S. Miller
Browse files

net: dsa: microchip: add config_cpu_port to struct ksz_dev_ops 



To have the common set of initialization in ksz_setup, introduced the
new config_cpu_port member to ksz_dev_ops. Since both the ksz8795.c and
ksz9477.c configuring the cpu port in the setup function, introduced the
member.

Signed-off-by: default avatarArun Ramadoss <arun.ramadoss@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 673b196f

drivers/net/dsa/microchip/ksz8795.c

+2 −1
Original line number Diff line number Diff line
@@ -1402,7 +1402,7 @@ static int ksz8_setup(struct dsa_switch *ds) 
			   UNICAST_VLAN_BOUNDARY | NO_EXC_COLLISION_DROP,

			   UNICAST_VLAN_BOUNDARY | NO_EXC_COLLISION_DROP);



	ksz8_config_cpu_port(ds);

	dev->dev_ops->config_cpu_port(ds);



	ksz_cfg(dev, REG_SW_CTRL_2, MULTICAST_STORM_DISABLE, true);
@@ -1545,6 +1545,7 @@ static const struct ksz_dev_ops ksz8_dev_ops = { 
	.mirror_add = ksz8_port_mirror_add,

	.mirror_del = ksz8_port_mirror_del,

	.get_caps = ksz8_get_caps,

	.config_cpu_port = ksz8_config_cpu_port,

	.reset = ksz8_reset_switch,

	.init = ksz8_switch_init,

	.exit = ksz8_switch_exit,

drivers/net/dsa/microchip/ksz9477.c

+2 −1
Original line number Diff line number Diff line
@@ -1268,7 +1268,7 @@ static int ksz9477_setup(struct dsa_switch *ds) 
	if (ret)

		return ret;



	ksz9477_config_cpu_port(ds);

	dev->dev_ops->config_cpu_port(ds);



	ksz_cfg(dev, REG_SW_MAC_CTRL_1, MULTICAST_STORM_DISABLE, true);
@@ -1400,6 +1400,7 @@ static const struct ksz_dev_ops ksz9477_dev_ops = { 
	.mdb_del = ksz9477_mdb_del,

	.change_mtu = ksz9477_change_mtu,

	.max_mtu = ksz9477_max_mtu,

	.config_cpu_port = ksz9477_config_cpu_port,

	.reset = ksz9477_reset_switch,

	.init = ksz9477_switch_init,

	.exit = ksz9477_switch_exit,

drivers/net/dsa/microchip/ksz_common.h

+1 −0
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ struct ksz_dev_ops { 
	int (*max_mtu)(struct ksz_device *dev, int port);

	void (*freeze_mib)(struct ksz_device *dev, int port, bool freeze);

	void (*port_init_cnt)(struct ksz_device *dev, int port);

	void (*config_cpu_port)(struct dsa_switch *ds);

	int (*reset)(struct ksz_device *dev);

	int (*init)(struct ksz_device *dev);

	void (*exit)(struct ksz_device *dev);