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

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

Merge branch 'dsa-sort' 



Andrew Lunn says:

====================
net: dsa: Sort various lists

As we gain more DSA drivers and tagging protocols, the lists are
getting a bit unruly. Do some sorting.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0d9a5997 ec34e93f

drivers/net/dsa/Kconfig

+20 −20
Original line number Diff line number Diff line 
menu "Distributed Switch Architecture drivers"

	depends on HAVE_NET_DSA



config NET_DSA_MV88E6060

	tristate "Marvell 88E6060 ethernet switch chip support"

	depends on NET_DSA

	select NET_DSA_TAG_TRAILER

	---help---

	  This enables support for the Marvell 88E6060 ethernet switch

	  chip.

source "drivers/net/dsa/b53/Kconfig"



config NET_DSA_BCM_SF2

	tristate "Broadcom Starfighter 2 Ethernet switch support"
@@ -21,19 +15,6 @@ config NET_DSA_BCM_SF2 
	  This enables support for the Broadcom Starfighter 2 Ethernet

	  switch chips.



source "drivers/net/dsa/b53/Kconfig"



source "drivers/net/dsa/mv88e6xxx/Kconfig"



config NET_DSA_QCA8K

	tristate "Qualcomm Atheros QCA8K Ethernet switch family support"

	depends on NET_DSA

	select NET_DSA_TAG_QCA

	select REGMAP

	---help---

	  This enables support for the Qualcomm Atheros QCA8K Ethernet

	  switch chips.



config NET_DSA_LOOP

	tristate "DSA mock-up Ethernet switch chip support"

	depends on NET_DSA
@@ -50,6 +31,25 @@ config NET_DSA_MT7530 
	  This enables support for the Mediatek MT7530 Ethernet switch

	  chip.



config NET_DSA_MV88E6060

	tristate "Marvell 88E6060 ethernet switch chip support"

	depends on NET_DSA

	select NET_DSA_TAG_TRAILER

	---help---

	  This enables support for the Marvell 88E6060 ethernet switch

	  chip.



source "drivers/net/dsa/mv88e6xxx/Kconfig"



config NET_DSA_QCA8K

	tristate "Qualcomm Atheros QCA8K Ethernet switch family support"

	depends on NET_DSA

	select NET_DSA_TAG_QCA

	select REGMAP

	---help---

	  This enables support for the Qualcomm Atheros QCA8K Ethernet

	  switch chips.



config NET_DSA_SMSC_LAN9303

	tristate

	select NET_DSA_TAG_LAN9303

drivers/net/dsa/Makefile

+3 −3
Original line number Diff line number Diff line 
obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o

obj-$(CONFIG_NET_DSA_BCM_SF2)	+= bcm-sf2.o

bcm-sf2-objs			:= bcm_sf2.o bcm_sf2_cfp.o

obj-$(CONFIG_NET_DSA_QCA8K)	+= qca8k.o

obj-$(CONFIG_NET_DSA_LOOP)	+= dsa_loop.o dsa_loop_bdinfo.o

obj-$(CONFIG_NET_DSA_MT7530)	+= mt7530.o

obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o

obj-$(CONFIG_NET_DSA_QCA8K)	+= qca8k.o

obj-$(CONFIG_NET_DSA_SMSC_LAN9303) += lan9303-core.o

obj-$(CONFIG_NET_DSA_SMSC_LAN9303_I2C) += lan9303_i2c.o

obj-$(CONFIG_NET_DSA_SMSC_LAN9303_MDIO) += lan9303_mdio.o

obj-y				+= b53/

obj-y				+= mv88e6xxx/
 
obj-$(CONFIG_NET_DSA_LOOP)	+= dsa_loop.o dsa_loop_bdinfo.o

include/net/dsa.h

+4 −4
Original line number Diff line number Diff line
@@ -27,13 +27,13 @@ struct fixed_phy_status; 


enum dsa_tag_protocol {

	DSA_TAG_PROTO_NONE = 0,

	DSA_TAG_PROTO_BRCM,

	DSA_TAG_PROTO_DSA,

	DSA_TAG_PROTO_TRAILER,

	DSA_TAG_PROTO_EDSA,

	DSA_TAG_PROTO_BRCM,

	DSA_TAG_PROTO_QCA,

	DSA_TAG_PROTO_MTK,

	DSA_TAG_PROTO_LAN9303,

	DSA_TAG_PROTO_MTK,

	DSA_TAG_PROTO_QCA,

	DSA_TAG_PROTO_TRAILER,

	DSA_TAG_LAST,		/* MUST BE LAST */

};

net/dsa/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -25,16 +25,16 @@ config NET_DSA_TAG_DSA 
config NET_DSA_TAG_EDSA

	bool



config NET_DSA_TAG_TRAILER

config NET_DSA_TAG_LAN9303

	bool



config NET_DSA_TAG_QCA

config NET_DSA_TAG_MTK

	bool



config NET_DSA_TAG_MTK

config NET_DSA_TAG_TRAILER

	bool



config NET_DSA_TAG_LAN9303

config NET_DSA_TAG_QCA

	bool



endif

net/dsa/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ dsa_core-y += dsa.o slave.o dsa2.o switch.o legacy.o 
dsa_core-$(CONFIG_NET_DSA_TAG_BRCM) += tag_brcm.o

dsa_core-$(CONFIG_NET_DSA_TAG_DSA) += tag_dsa.o

dsa_core-$(CONFIG_NET_DSA_TAG_EDSA) += tag_edsa.o

dsa_core-$(CONFIG_NET_DSA_TAG_TRAILER) += tag_trailer.o

dsa_core-$(CONFIG_NET_DSA_TAG_QCA) += tag_qca.o

dsa_core-$(CONFIG_NET_DSA_TAG_MTK) += tag_mtk.o

dsa_core-$(CONFIG_NET_DSA_TAG_LAN9303) += tag_lan9303.o

dsa_core-$(CONFIG_NET_DSA_TAG_MTK) += tag_mtk.o

dsa_core-$(CONFIG_NET_DSA_TAG_QCA) += tag_qca.o

dsa_core-$(CONFIG_NET_DSA_TAG_TRAILER) += tag_trailer.o