net: dsa: qca8k: move driver to qca dir

Move qca8k driver to qca dir in preparation for code split and
introduction of ipq4019 switch based on qca8k.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/Kconfig b/drivers/net/dsa/Kconfig
index 702d68ae435a978268e2aaa1e95a22a94c477848..d8ae0e8af2a03c7279579bba0c7d89ba83dd496c 100644 (file)
--- a/drivers/net/dsa/Kconfig
+++ b/drivers/net/dsa/Kconfig
@@ -60,14 +60,6 @@ source "drivers/net/dsa/sja1105/Kconfig"
 
 source "drivers/net/dsa/xrs700x/Kconfig"
 
-config NET_DSA_QCA8K
-       tristate "Qualcomm Atheros QCA8K Ethernet switch family support"
-       select NET_DSA_TAG_QCA
-       select REGMAP
-       help
-         This enables support for the Qualcomm Atheros QCA8K Ethernet
-         switch chips.
-
 source "drivers/net/dsa/realtek/Kconfig"
 
 config NET_DSA_RZN1_A5PSW

diff --git a/drivers/net/dsa/Makefile b/drivers/net/dsa/Makefile
index b32907afa70212f0b40e86385f58488056f8efdd..16eb879e0cb4da2d934aaf43f55ef831b9f89acf 100644 (file)
--- a/drivers/net/dsa/Makefile
+++ b/drivers/net/dsa/Makefile
@@ -8,7 +8,6 @@ endif
 obj-$(CONFIG_NET_DSA_LANTIQ_GSWIP) += lantiq_gswip.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_RZN1_A5PSW) += rzn1_a5psw.o
 obj-$(CONFIG_NET_DSA_SMSC_LAN9303) += lan9303-core.o
 obj-$(CONFIG_NET_DSA_SMSC_LAN9303_I2C) += lan9303_i2c.o

diff --git a/drivers/net/dsa/qca/Kconfig b/drivers/net/dsa/qca/Kconfig
index 13b7e679b8b542084979e7185bc0fd7a6c2cb091..ba339747362c63be214756dc0ab256c3918943d8 100644 (file)
--- a/drivers/net/dsa/qca/Kconfig
+++ b/drivers/net/dsa/qca/Kconfig
@@ -7,3 +7,11 @@ config NET_DSA_AR9331
        help
          This enables support for the Qualcomm Atheros AR9331 built-in Ethernet
          switch.
+
+config NET_DSA_QCA8K
+       tristate "Qualcomm Atheros QCA8K Ethernet switch family support"
+       select NET_DSA_TAG_QCA
+       select REGMAP
+       help
+         This enables support for the Qualcomm Atheros QCA8K Ethernet
+         switch chips.

diff --git a/drivers/net/dsa/qca/Makefile b/drivers/net/dsa/qca/Makefile
index 274022319066d399a97fbcb02d8b978f69871ca3..40bb7c27285b883e461f5e003984b272c7f6f964 100644 (file)
--- a/drivers/net/dsa/qca/Makefile
+++ b/drivers/net/dsa/qca/Makefile
@@ -1,2 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_NET_DSA_AR9331)   += ar9331.o
+obj-$(CONFIG_NET_DSA_QCA8K)    += qca8k.o

diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca/qca8k.c
similarity index 100%
rename from drivers/net/dsa/qca8k.c
rename to drivers/net/dsa/qca/qca8k.c

diff --git a/drivers/net/dsa/qca8k.h b/drivers/net/dsa/qca/qca8k.h
similarity index 100%
rename from drivers/net/dsa/qca8k.h
rename to drivers/net/dsa/qca/qca8k.h