From: Vladimir Oltean <olteanv@gmail.com>
To: jakub.kicinski@netronome.com, davem@davemloft.net,
alexandre.belloni@bootlin.com
Cc: andrew@lunn.ch, f.fainelli@gmail.com, vivien.didelot@gmail.com,
joergen.andreasen@microchip.com, allan.nielsen@microchip.com,
horatiu.vultur@microchip.com, claudiu.manoil@nxp.com,
netdev@vger.kernel.org, Vladimir Oltean <vladimir.oltean@nxp.com>
Subject: [PATCH net-next 10/12] net: dsa: vitesse: move vsc73xx driver to a separate folder
Date: Tue, 12 Nov 2019 14:44:18 +0200 [thread overview]
Message-ID: <20191112124420.6225-11-olteanv@gmail.com> (raw)
In-Reply-To: <20191112124420.6225-1-olteanv@gmail.com>
From: Vladimir Oltean <vladimir.oltean@nxp.com>
The vitesse/ folder will contain drivers for switching chips derived
from legacy Vitesse IPs (VSC family), including those produced by
Microsemi and Microchip (acquirers of Vitesse).
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
drivers/net/dsa/Kconfig | 31 +------------------
drivers/net/dsa/Makefile | 4 +--
drivers/net/dsa/vitesse/Kconfig | 31 +++++++++++++++++++
drivers/net/dsa/vitesse/Makefile | 3 ++
.../vsc73xx-core.c} | 2 +-
.../vsc73xx-platform.c} | 2 +-
.../vsc73xx-spi.c} | 2 +-
.../{vitesse-vsc73xx.h => vitesse/vsc73xx.h} | 0
8 files changed, 39 insertions(+), 36 deletions(-)
create mode 100644 drivers/net/dsa/vitesse/Kconfig
create mode 100644 drivers/net/dsa/vitesse/Makefile
rename drivers/net/dsa/{vitesse-vsc73xx-core.c => vitesse/vsc73xx-core.c} (99%)
rename drivers/net/dsa/{vitesse-vsc73xx-platform.c => vitesse/vsc73xx-platform.c} (99%)
rename drivers/net/dsa/{vitesse-vsc73xx-spi.c => vitesse/vsc73xx-spi.c} (99%)
rename drivers/net/dsa/{vitesse-vsc73xx.h => vitesse/vsc73xx.h} (100%)
diff --git a/drivers/net/dsa/Kconfig b/drivers/net/dsa/Kconfig
index 685e12b05a7c..ec91960e58ac 100644
--- a/drivers/net/dsa/Kconfig
+++ b/drivers/net/dsa/Kconfig
@@ -99,35 +99,6 @@ config NET_DSA_SMSC_LAN9303_MDIO
Enable access functions if the SMSC/Microchip LAN9303 is configured
for MDIO managed mode.
-config NET_DSA_VITESSE_VSC73XX
- tristate
- depends on OF
- depends on NET_DSA
- select FIXED_PHY
- select VITESSE_PHY
- select GPIOLIB
- ---help---
- This enables support for the Vitesse VSC7385, VSC7388,
- VSC7395 and VSC7398 SparX integrated ethernet switches.
+source "drivers/net/dsa/vitesse/Kconfig"
-config NET_DSA_VITESSE_VSC73XX_SPI
- tristate "Vitesse VSC7385/7388/7395/7398 SPI mode support"
- depends on OF
- depends on NET_DSA
- depends on SPI
- select NET_DSA_VITESSE_VSC73XX
- ---help---
- This enables support for the Vitesse VSC7385, VSC7388, VSC7395
- and VSC7398 SparX integrated ethernet switches in SPI managed mode.
-
-config NET_DSA_VITESSE_VSC73XX_PLATFORM
- tristate "Vitesse VSC7385/7388/7395/7398 Platform mode support"
- depends on OF
- depends on NET_DSA
- depends on HAS_IOMEM
- select NET_DSA_VITESSE_VSC73XX
- ---help---
- This enables support for the Vitesse VSC7385, VSC7388, VSC7395
- and VSC7398 SparX integrated ethernet switches, connected over
- a CPU-attached address bus and work in memory-mapped I/O mode.
endmenu
diff --git a/drivers/net/dsa/Makefile b/drivers/net/dsa/Makefile
index ae70b79628d6..158d34f8c085 100644
--- a/drivers/net/dsa/Makefile
+++ b/drivers/net/dsa/Makefile
@@ -14,10 +14,8 @@ realtek-smi-objs := realtek-smi-core.o rtl8366.o rtl8366rb.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-$(CONFIG_NET_DSA_VITESSE_VSC73XX) += vitesse-vsc73xx-core.o
-obj-$(CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM) += vitesse-vsc73xx-platform.o
-obj-$(CONFIG_NET_DSA_VITESSE_VSC73XX_SPI) += vitesse-vsc73xx-spi.o
obj-y += b53/
obj-y += microchip/
obj-y += mv88e6xxx/
obj-y += sja1105/
+obj-y += vitesse/
diff --git a/drivers/net/dsa/vitesse/Kconfig b/drivers/net/dsa/vitesse/Kconfig
new file mode 100644
index 000000000000..54be4b34fd17
--- /dev/null
+++ b/drivers/net/dsa/vitesse/Kconfig
@@ -0,0 +1,31 @@
+config NET_DSA_VITESSE_VSC73XX
+ tristate
+ depends on OF
+ depends on NET_DSA
+ select FIXED_PHY
+ select VITESSE_PHY
+ select GPIOLIB
+ ---help---
+ This enables support for the Vitesse VSC7385, VSC7388,
+ VSC7395 and VSC7398 SparX integrated ethernet switches.
+
+config NET_DSA_VITESSE_VSC73XX_SPI
+ tristate "Vitesse VSC7385/7388/7395/7398 SPI mode support"
+ depends on OF
+ depends on NET_DSA
+ depends on SPI
+ select NET_DSA_VITESSE_VSC73XX
+ ---help---
+ This enables support for the Vitesse VSC7385, VSC7388, VSC7395
+ and VSC7398 SparX integrated ethernet switches in SPI managed mode.
+
+config NET_DSA_VITESSE_VSC73XX_PLATFORM
+ tristate "Vitesse VSC7385/7388/7395/7398 Platform mode support"
+ depends on OF
+ depends on NET_DSA
+ depends on HAS_IOMEM
+ select NET_DSA_VITESSE_VSC73XX
+ ---help---
+ This enables support for the Vitesse VSC7385, VSC7388, VSC7395
+ and VSC7398 SparX integrated ethernet switches, connected over
+ a CPU-attached address bus and work in memory-mapped I/O mode.
diff --git a/drivers/net/dsa/vitesse/Makefile b/drivers/net/dsa/vitesse/Makefile
new file mode 100644
index 000000000000..adceeeec5d12
--- /dev/null
+++ b/drivers/net/dsa/vitesse/Makefile
@@ -0,0 +1,3 @@
+obj-$(CONFIG_NET_DSA_VITESSE_VSC73XX) += vsc73xx-core.o
+obj-$(CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM) += vsc73xx-platform.o
+obj-$(CONFIG_NET_DSA_VITESSE_VSC73XX_SPI) += vsc73xx-spi.o
diff --git a/drivers/net/dsa/vitesse-vsc73xx-core.c b/drivers/net/dsa/vitesse/vsc73xx-core.c
similarity index 99%
rename from drivers/net/dsa/vitesse-vsc73xx-core.c
rename to drivers/net/dsa/vitesse/vsc73xx-core.c
index 42c1574d45f2..d44dc5821938 100644
--- a/drivers/net/dsa/vitesse-vsc73xx-core.c
+++ b/drivers/net/dsa/vitesse/vsc73xx-core.c
@@ -28,7 +28,7 @@
#include <linux/random.h>
#include <net/dsa.h>
-#include "vitesse-vsc73xx.h"
+#include "vsc73xx.h"
#define VSC73XX_BLOCK_MAC 0x1 /* Subblocks 0-4, 6 (CPU port) */
#define VSC73XX_BLOCK_ANALYZER 0x2 /* Only subblock 0 */
diff --git a/drivers/net/dsa/vitesse-vsc73xx-platform.c b/drivers/net/dsa/vitesse/vsc73xx-platform.c
similarity index 99%
rename from drivers/net/dsa/vitesse-vsc73xx-platform.c
rename to drivers/net/dsa/vitesse/vsc73xx-platform.c
index 0541785f9fee..0ccf622aff96 100644
--- a/drivers/net/dsa/vitesse-vsc73xx-platform.c
+++ b/drivers/net/dsa/vitesse/vsc73xx-platform.c
@@ -20,7 +20,7 @@
#include <linux/of.h>
#include <linux/platform_device.h>
-#include "vitesse-vsc73xx.h"
+#include "vsc73xx.h"
#define VSC73XX_CMD_PLATFORM_BLOCK_SHIFT 14
#define VSC73XX_CMD_PLATFORM_BLOCK_MASK 0x7
diff --git a/drivers/net/dsa/vitesse-vsc73xx-spi.c b/drivers/net/dsa/vitesse/vsc73xx-spi.c
similarity index 99%
rename from drivers/net/dsa/vitesse-vsc73xx-spi.c
rename to drivers/net/dsa/vitesse/vsc73xx-spi.c
index e73c8fcddc9f..d75fcee0defb 100644
--- a/drivers/net/dsa/vitesse-vsc73xx-spi.c
+++ b/drivers/net/dsa/vitesse/vsc73xx-spi.c
@@ -17,7 +17,7 @@
#include <linux/of.h>
#include <linux/spi/spi.h>
-#include "vitesse-vsc73xx.h"
+#include "vsc73xx.h"
#define VSC73XX_CMD_SPI_MODE_READ 0
#define VSC73XX_CMD_SPI_MODE_WRITE 1
diff --git a/drivers/net/dsa/vitesse-vsc73xx.h b/drivers/net/dsa/vitesse/vsc73xx.h
similarity index 100%
rename from drivers/net/dsa/vitesse-vsc73xx.h
rename to drivers/net/dsa/vitesse/vsc73xx.h
--
2.17.1
next prev parent reply other threads:[~2019-11-12 12:44 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-12 12:44 [PATCH net-next 00/12] DSA driver for Vitesse Felix switch Vladimir Oltean
2019-11-12 12:44 ` [PATCH net-next 01/12] net: mscc: ocelot: move resource ioremap and regmap init to common code Vladimir Oltean
2019-11-12 12:44 ` [PATCH net-next 02/12] net: mscc: ocelot: filter out ocelot SoC specific PCS config from common path Vladimir Oltean
2019-11-12 13:31 ` Andrew Lunn
2019-11-12 21:28 ` Florian Fainelli
2019-11-13 9:40 ` kbuild test robot
2019-11-12 12:44 ` [PATCH net-next 03/12] net: mscc: ocelot: move invariant configs out of adjust_link Vladimir Oltean
2019-11-12 13:35 ` Andrew Lunn
2019-11-12 13:38 ` Vladimir Oltean
2019-11-12 21:30 ` Florian Fainelli
2019-11-12 12:44 ` [PATCH net-next 04/12] net: mscc: ocelot: create a helper for changing the port MTU Vladimir Oltean
2019-11-12 13:39 ` Andrew Lunn
2019-11-12 13:41 ` Vladimir Oltean
2019-11-12 21:31 ` Florian Fainelli
2019-11-12 12:44 ` [PATCH net-next 05/12] net: mscc: ocelot: export a constant for the tag length in bytes Vladimir Oltean
2019-11-12 13:44 ` Andrew Lunn
2019-11-12 21:32 ` Florian Fainelli
2019-11-12 12:44 ` [PATCH net-next 06/12] net: mscc: ocelot: adjust MTU on the CPU port in NPI mode Vladimir Oltean
2019-11-12 13:51 ` Andrew Lunn
2019-11-12 13:52 ` Vladimir Oltean
2019-11-12 13:57 ` Andrew Lunn
2019-11-12 21:32 ` Florian Fainelli
2019-11-12 12:44 ` [PATCH net-next 07/12] net: mscc: ocelot: separate the implementation of switch reset Vladimir Oltean
2019-11-12 13:55 ` Andrew Lunn
2019-11-12 13:59 ` Vladimir Oltean
2019-11-13 8:57 ` Alexandre Belloni
2019-11-12 21:34 ` Florian Fainelli
2019-11-12 12:44 ` [PATCH net-next 08/12] net: mscc: ocelot: publish structure definitions to include/soc/mscc/ocelot.h Vladimir Oltean
2019-11-12 14:42 ` Andrew Lunn
2019-11-12 16:18 ` Vladimir Oltean
2019-11-12 21:36 ` Florian Fainelli
2019-11-13 12:48 ` kbuild test robot
2019-11-12 12:44 ` [PATCH net-next 09/12] net: mscc: ocelot: publish ocelot_sys.h to include/soc/mscc Vladimir Oltean
2019-11-12 21:38 ` Florian Fainelli
2019-11-12 12:44 ` Vladimir Oltean [this message]
2019-11-12 13:09 ` [PATCH net-next 10/12] net: dsa: vitesse: move vsc73xx driver to a separate folder Alexandre Belloni
2019-11-12 13:40 ` Vladimir Oltean
2019-11-12 14:33 ` Allan W. Nielsen
2019-11-12 14:50 ` Andrew Lunn
2019-11-12 14:57 ` Allan W. Nielsen
2019-11-12 15:26 ` Vladimir Oltean
2019-11-12 19:09 ` Allan W. Nielsen
2019-11-12 19:26 ` Vladimir Oltean
2019-11-12 19:48 ` Allan W. Nielsen
2019-11-12 20:01 ` Vladimir Oltean
2019-11-13 7:38 ` Allan W. Nielsen
2019-11-13 8:47 ` Alexandre Belloni
2019-11-12 21:49 ` Florian Fainelli
2019-11-12 12:44 ` [PATCH net-next 11/12] net: dsa: vitesse: add basic Felix switch driver Vladimir Oltean
2019-11-12 12:44 ` [PATCH net-next 12/12] net: dsa: vitesse: add tagger for Ocelot/Felix switches Vladimir Oltean
2019-11-12 21:48 ` Florian Fainelli
2019-11-13 2:14 ` Andrew Lunn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191112124420.6225-11-olteanv@gmail.com \
--to=olteanv@gmail.com \
--cc=alexandre.belloni@bootlin.com \
--cc=allan.nielsen@microchip.com \
--cc=andrew@lunn.ch \
--cc=claudiu.manoil@nxp.com \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=horatiu.vultur@microchip.com \
--cc=jakub.kicinski@netronome.com \
--cc=joergen.andreasen@microchip.com \
--cc=netdev@vger.kernel.org \
--cc=vivien.didelot@gmail.com \
--cc=vladimir.oltean@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).