Commit 5312b93b authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'dsa-tag-cleanups' 



Marek Vasut says:

====================
net: dsa: ksz: Clean up the tag code in prep for more switches

Clean up the KSZ DSA tag code in preparation for adding more switches.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 036b9e7c 8a75b9d4

drivers/net/dsa/microchip/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ config NET_DSA_MICROCHIP_KSZ_COMMON 
menuconfig NET_DSA_MICROCHIP_KSZ9477

	tristate "Microchip KSZ9477 series switch support"

	depends on NET_DSA

	select NET_DSA_TAG_KSZ

	select NET_DSA_TAG_KSZ9477

	select NET_DSA_MICROCHIP_KSZ_COMMON

	help

	  This driver adds support for Microchip KSZ9477 switch chips.

drivers/net/dsa/microchip/ksz9477.c

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static int ksz9477_reset_switch(struct ksz_device *dev) 
static enum dsa_tag_protocol ksz9477_get_tag_protocol(struct dsa_switch *ds,

						      int port)

{

	return DSA_TAG_PROTO_KSZ;

	return DSA_TAG_PROTO_KSZ9477;

}



static int ksz9477_phy_read16(struct dsa_switch *ds, int addr, int reg)

include/net/dsa.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ enum dsa_tag_protocol { 
	DSA_TAG_PROTO_DSA,

	DSA_TAG_PROTO_EDSA,

	DSA_TAG_PROTO_GSWIP,

	DSA_TAG_PROTO_KSZ,

	DSA_TAG_PROTO_KSZ9477,

	DSA_TAG_PROTO_LAN9303,

	DSA_TAG_PROTO_MTK,

	DSA_TAG_PROTO_QCA,

net/dsa/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -44,6 +44,10 @@ config NET_DSA_TAG_GSWIP 
config NET_DSA_TAG_KSZ

	bool



config NET_DSA_TAG_KSZ9477

	bool

	select NET_DSA_TAG_KSZ



config NET_DSA_TAG_LAN9303

	bool

net/dsa/dsa.c

+4 −4
Original line number Diff line number Diff line
@@ -55,8 +55,8 @@ const struct dsa_device_ops *dsa_device_ops[DSA_TAG_LAST] = { 
#ifdef CONFIG_NET_DSA_TAG_GSWIP

	[DSA_TAG_PROTO_GSWIP] = &gswip_netdev_ops,

#endif

#ifdef CONFIG_NET_DSA_TAG_KSZ

	[DSA_TAG_PROTO_KSZ] = &ksz_netdev_ops,

#ifdef CONFIG_NET_DSA_TAG_KSZ9477

	[DSA_TAG_PROTO_KSZ9477] = &ksz9477_netdev_ops,

#endif

#ifdef CONFIG_NET_DSA_TAG_LAN9303

	[DSA_TAG_PROTO_LAN9303] = &lan9303_netdev_ops,
@@ -91,8 +91,8 @@ const char *dsa_tag_protocol_to_str(const struct dsa_device_ops *ops) 
#ifdef CONFIG_NET_DSA_TAG_GSWIP

		[DSA_TAG_PROTO_GSWIP] = "gswip",

#endif

#ifdef CONFIG_NET_DSA_TAG_KSZ

		[DSA_TAG_PROTO_KSZ] = "ksz",

#ifdef CONFIG_NET_DSA_TAG_KSZ9477

		[DSA_TAG_PROTO_KSZ9477] = "ksz9477",

#endif

#ifdef CONFIG_NET_DSA_TAG_LAN9303

		[DSA_TAG_PROTO_LAN9303] = "lan9303",