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

Merge branch 'DSA-driver-for-Vitesse-Felix-switch' 



Vladimir Oltean says:

====================
DSA driver for Vitesse Felix switch

This series builds upon the previous "Accomodate DSA front-end into
Ocelot" topic and does the following:

- Reworks the Ocelot (VSC7514) driver to support one more switching core
  (VSC9959), used in NPI mode. Some code which was thought to be
  SoC-specific (ocelot_board.c) wasn't, and vice versa, so it is being
  accordingly moved.
- Exports ocelot driver structures and functions to include/soc/mscc.
- Adds a DSA ocelot front-end for VSC9959, which is a PCI device and
  uses the exported ocelot functionality for hardware configuration.
- Adds a tagger driver for the Vitesse injection/extraction DSA headers.
  This is known to be compatible with at least Ocelot and Felix.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e7be235f 56051948

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -10834,6 +10834,7 @@ M: Microchip Linux Driver Support <UNGLinuxDriver@microchip.com> 
L:	netdev@vger.kernel.org

S:	Supported

F:	drivers/net/ethernet/mscc/

F:	include/soc/mscc/ocelot*















MICROSOFT SURFACE PRO 3 BUTTON DRIVER















M:	Chen Yu <yu.c.chen@intel.com>










@@ -17359,6 +17360,14 @@ S:	Maintained













F:	drivers/input/serio/userio.c















F:	include/uapi/linux/userio.h



























VITESSE FELIX ETHERNET SWITCH DRIVER













M:	Vladimir Oltean <vladimir.oltean@nxp.com>













M:	Claudiu Manoil <claudiu.manoil@nxp.com>













L:	netdev@vger.kernel.org













S:	Maintained













F:	drivers/net/dsa/ocelot/*













F:	net/dsa/tag_ocelot.c



























VIVID VIRTUAL VIDEO DRIVER















M:	Hans Verkuil <hverkuil@xs4all.nl>















L:	linux-media@vger.kernel.org

































drivers/net/dsa/Kconfig



+2
−0






























Original line number
Diff line number
Diff line








@@ -52,6 +52,8 @@ source "drivers/net/dsa/microchip/Kconfig"





























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





























source "drivers/net/dsa/ocelot/Kconfig"





























source "drivers/net/dsa/sja1105/Kconfig"































config NET_DSA_QCA8K

































drivers/net/dsa/Makefile



+1
−0






























Original line number
Diff line number
Diff line








@@ -20,4 +20,5 @@ obj-$(CONFIG_NET_DSA_VITESSE_VSC73XX_SPI) += vitesse-vsc73xx-spi.o













obj-y				+= b53/















obj-y				+= microchip/















obj-y				+= mv88e6xxx/













obj-y				+= ocelot/















obj-y				+= sja1105/
























drivers/net/dsa/ocelot/Kconfig
0 → 100644



+11
−0






























Original line number
Diff line number
Diff line













# SPDX-License-Identifier: GPL-2.0-only













config NET_DSA_MSCC_FELIX













	tristate "Ocelot / Felix Ethernet switch support"













	depends on NET_DSA && PCI













	select MSCC_OCELOT_SWITCH













	select NET_DSA_TAG_OCELOT













	help













	  This driver supports the VSC9959 network switch, which is a member of













	  the Vitesse / Microsemi / Microchip Ocelot family of switching cores.













	  It is embedded as a PCIe function of the NXP LS1028A ENETC integrated













	  endpoint.
























drivers/net/dsa/ocelot/Makefile
0 → 100644



+6
−0






























Original line number
Diff line number
Diff line













# SPDX-License-Identifier: GPL-2.0-only













obj-$(CONFIG_NET_DSA_MSCC_FELIX) += mscc_felix.o



























mscc_felix-objs := \













	felix.o \













	felix_vsc9959.o
































































CRA Git | Maintained and supported by SUSTech CRA and CCSE