From ec502cd3fe926f0dbc5f6020ee22929b18ef16ee Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@nbd.name>
Date: Mon, 30 Apr 2018 09:24:50 +0200
Subject: [PATCH] ramips: rename ethernet driver folder to the same one that
 upstream uses

Preparation for sharing offload code with the mediatek target through
generic files/

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
 .../net/ethernet/{mtk => mediatek}/Kconfig    |  0
 .../net/ethernet/{mtk => mediatek}/Makefile   |  0
 .../ethernet/{mtk => mediatek}/esw_rt3050.c   |  0
 .../ethernet/{mtk => mediatek}/esw_rt3050.h   |  0
 .../net/ethernet/{mtk => mediatek}/ethtool.c  |  0
 .../net/ethernet/{mtk => mediatek}/ethtool.h  |  0
 .../ethernet/{mtk => mediatek}/gsw_mt7620.c   |  0
 .../ethernet/{mtk => mediatek}/gsw_mt7620.h   |  0
 .../ethernet/{mtk => mediatek}/gsw_mt7621.c   |  0
 .../net/ethernet/{mtk => mediatek}/mdio.c     |  0
 .../net/ethernet/{mtk => mediatek}/mdio.h     |  0
 .../ethernet/{mtk => mediatek}/mdio_mt7620.c  |  0
 .../ethernet/{mtk => mediatek}/mdio_rt2880.c  |  0
 .../ethernet/{mtk => mediatek}/mdio_rt2880.h  |  0
 .../net/ethernet/{mtk => mediatek}/mt7530.c   |  0
 .../net/ethernet/{mtk => mediatek}/mt7530.h   |  0
 .../ethernet/{mtk => mediatek}/mtk_debugfs.c  |  0
 .../ethernet/{mtk => mediatek}/mtk_eth_soc.c  |  0
 .../ethernet/{mtk => mediatek}/mtk_eth_soc.h  |  0
 .../ethernet/{mtk => mediatek}/mtk_offload.c  |  0
 .../ethernet/{mtk => mediatek}/mtk_offload.h  |  0
 .../ethernet/{mtk => mediatek}/soc_mt7620.c   |  0
 .../ethernet/{mtk => mediatek}/soc_mt7621.c   |  0
 .../ethernet/{mtk => mediatek}/soc_rt2880.c   |  0
 .../ethernet/{mtk => mediatek}/soc_rt3050.c   |  0
 .../ethernet/{mtk => mediatek}/soc_rt3883.c   |  0
 .../ramips/patches-4.14/0090-ethernet.patch   | 41 -------------------
 27 files changed, 41 deletions(-)
 rename target/linux/ramips/files-4.14/drivers/net/ethernet/{mtk => mediatek}/Kconfig (100%)
 rename target/linux/ramips/files-4.14/drivers/net/ethernet/{mtk => mediatek}/Makefile (100%)
 rename target/linux/ramips/files-4.14/drivers/net/ethernet/{mtk => mediatek}/esw_rt3050.c (100%)
 rename target/linux/ramips/files-4.14/drivers/net/ethernet/{mtk => mediatek}/esw_rt3050.h (100%)
 rename target/linux/ramips/files-4.14/drivers/net/ethernet/{mtk => mediatek}/ethtool.c (100%)
 rename target/linux/ramips/files-4.14/drivers/net/ethernet/{mtk => mediatek}/ethtool.h (100%)
 rename target/linux/ramips/files-4.14/drivers/net/ethernet/{mtk => mediatek}/gsw_mt7620.c (100%)
 rename target/linux/ramips/files-4.14/drivers/net/ethernet/{mtk => mediatek}/gsw_mt7620.h (100%)
 rename target/linux/ramips/files-4.14/drivers/net/ethernet/{mtk => mediatek}/gsw_mt7621.c (100%)
 rename target/linux/ramips/files-4.14/drivers/net/ethernet/{mtk => mediatek}/mdio.c (100%)
 rename target/linux/ramips/files-4.14/drivers/net/ethernet/{mtk => mediatek}/mdio.h (100%)
 rename target/linux/ramips/files-4.14/drivers/net/ethernet/{mtk => mediatek}/mdio_mt7620.c (100%)
 rename target/linux/ramips/files-4.14/drivers/net/ethernet/{mtk => mediatek}/mdio_rt2880.c (100%)
 rename target/linux/ramips/files-4.14/drivers/net/ethernet/{mtk => mediatek}/mdio_rt2880.h (100%)
 rename target/linux/ramips/files-4.14/drivers/net/ethernet/{mtk => mediatek}/mt7530.c (100%)
 rename target/linux/ramips/files-4.14/drivers/net/ethernet/{mtk => mediatek}/mt7530.h (100%)
 rename target/linux/ramips/files-4.14/drivers/net/ethernet/{mtk => mediatek}/mtk_debugfs.c (100%)
 rename target/linux/ramips/files-4.14/drivers/net/ethernet/{mtk => mediatek}/mtk_eth_soc.c (100%)
 rename target/linux/ramips/files-4.14/drivers/net/ethernet/{mtk => mediatek}/mtk_eth_soc.h (100%)
 rename target/linux/ramips/files-4.14/drivers/net/ethernet/{mtk => mediatek}/mtk_offload.c (100%)
 rename target/linux/ramips/files-4.14/drivers/net/ethernet/{mtk => mediatek}/mtk_offload.h (100%)
 rename target/linux/ramips/files-4.14/drivers/net/ethernet/{mtk => mediatek}/soc_mt7620.c (100%)
 rename target/linux/ramips/files-4.14/drivers/net/ethernet/{mtk => mediatek}/soc_mt7621.c (100%)
 rename target/linux/ramips/files-4.14/drivers/net/ethernet/{mtk => mediatek}/soc_rt2880.c (100%)
 rename target/linux/ramips/files-4.14/drivers/net/ethernet/{mtk => mediatek}/soc_rt3050.c (100%)
 rename target/linux/ramips/files-4.14/drivers/net/ethernet/{mtk => mediatek}/soc_rt3883.c (100%)
 delete mode 100644 target/linux/ramips/patches-4.14/0090-ethernet.patch

diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/Kconfig b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/Kconfig
similarity index 100%
rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/Kconfig
rename to target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/Kconfig
diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/Makefile b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/Makefile
similarity index 100%
rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/Makefile
rename to target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/Makefile
diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/esw_rt3050.c b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/esw_rt3050.c
similarity index 100%
rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/esw_rt3050.c
rename to target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/esw_rt3050.c
diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/esw_rt3050.h b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/esw_rt3050.h
similarity index 100%
rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/esw_rt3050.h
rename to target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/esw_rt3050.h
diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/ethtool.c b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/ethtool.c
similarity index 100%
rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/ethtool.c
rename to target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/ethtool.c
diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/ethtool.h b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/ethtool.h
similarity index 100%
rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/ethtool.h
rename to target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/ethtool.h
diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/gsw_mt7620.c b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/gsw_mt7620.c
similarity index 100%
rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/gsw_mt7620.c
rename to target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/gsw_mt7620.c
diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/gsw_mt7620.h b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/gsw_mt7620.h
similarity index 100%
rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/gsw_mt7620.h
rename to target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/gsw_mt7620.h
diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/gsw_mt7621.c b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/gsw_mt7621.c
similarity index 100%
rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/gsw_mt7621.c
rename to target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/gsw_mt7621.c
diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mdio.c b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mdio.c
similarity index 100%
rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mdio.c
rename to target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mdio.c
diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mdio.h b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mdio.h
similarity index 100%
rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mdio.h
rename to target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mdio.h
diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mdio_mt7620.c b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mdio_mt7620.c
similarity index 100%
rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mdio_mt7620.c
rename to target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mdio_mt7620.c
diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mdio_rt2880.c b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mdio_rt2880.c
similarity index 100%
rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mdio_rt2880.c
rename to target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mdio_rt2880.c
diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mdio_rt2880.h b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mdio_rt2880.h
similarity index 100%
rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mdio_rt2880.h
rename to target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mdio_rt2880.h
diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mt7530.c b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mt7530.c
similarity index 100%
rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mt7530.c
rename to target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mt7530.c
diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mt7530.h b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mt7530.h
similarity index 100%
rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mt7530.h
rename to target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mt7530.h
diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mtk_debugfs.c b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mtk_debugfs.c
similarity index 100%
rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mtk_debugfs.c
rename to target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mtk_debugfs.c
diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mtk_eth_soc.c b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mtk_eth_soc.c
similarity index 100%
rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mtk_eth_soc.c
rename to target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mtk_eth_soc.c
diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mtk_eth_soc.h b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mtk_eth_soc.h
similarity index 100%
rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mtk_eth_soc.h
rename to target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mtk_eth_soc.h
diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mtk_offload.c b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mtk_offload.c
similarity index 100%
rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mtk_offload.c
rename to target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mtk_offload.c
diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mtk_offload.h b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mtk_offload.h
similarity index 100%
rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mtk_offload.h
rename to target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mtk_offload.h
diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/soc_mt7620.c b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/soc_mt7620.c
similarity index 100%
rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/soc_mt7620.c
rename to target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/soc_mt7620.c
diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/soc_mt7621.c b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/soc_mt7621.c
similarity index 100%
rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/soc_mt7621.c
rename to target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/soc_mt7621.c
diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/soc_rt2880.c b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/soc_rt2880.c
similarity index 100%
rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/soc_rt2880.c
rename to target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/soc_rt2880.c
diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/soc_rt3050.c b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/soc_rt3050.c
similarity index 100%
rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/soc_rt3050.c
rename to target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/soc_rt3050.c
diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/soc_rt3883.c b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/soc_rt3883.c
similarity index 100%
rename from target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/soc_rt3883.c
rename to target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/soc_rt3883.c
diff --git a/target/linux/ramips/patches-4.14/0090-ethernet.patch b/target/linux/ramips/patches-4.14/0090-ethernet.patch
deleted file mode 100644
index 20f69fcc01..0000000000
--- a/target/linux/ramips/patches-4.14/0090-ethernet.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From b6f779ea9c329451b89404583b45b9eb00155b32 Mon Sep 17 00:00:00 2001
-From: John Crispin <blogic@openwrt.org>
-Date: Wed, 18 Nov 2015 03:58:26 +0100
-Subject: [PATCH 510/513] net-next: mediatek: add Kconfig and Makefile
-
-This patch adds the Makefile and Kconfig required to make the driver build.
-
-Signed-off-by: John Crispin <blogic@openwrt.org>
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
-Signed-off-by: Michael Lee <igvtee@gmail.com>
----
- drivers/net/ethernet/Kconfig           |    1 +
- drivers/net/ethernet/Makefile          |    1 +
- drivers/net/ethernet/mtk/Kconfig  |   62 ++++++++++++++++++++++++++++++++
- drivers/net/ethernet/mtk/Makefile |   20 +++++++++++
- 4 files changed, 84 insertions(+)
- create mode 100644 drivers/net/ethernet/mtk/Kconfig
- create mode 100644 drivers/net/ethernet/mtk/Makefile
-
---- a/drivers/net/ethernet/Kconfig
-+++ b/drivers/net/ethernet/Kconfig
-@@ -110,7 +110,7 @@ config LANTIQ_ETOP
- 	  Support for the MII0 inside the Lantiq SoC
- 
- source "drivers/net/ethernet/marvell/Kconfig"
--source "drivers/net/ethernet/mediatek/Kconfig"
-+source "drivers/net/ethernet/mtk/Kconfig"
- source "drivers/net/ethernet/mellanox/Kconfig"
- source "drivers/net/ethernet/micrel/Kconfig"
- source "drivers/net/ethernet/microchip/Kconfig"
---- a/drivers/net/ethernet/Makefile
-+++ b/drivers/net/ethernet/Makefile
-@@ -51,7 +51,7 @@ obj-$(CONFIG_JME) += jme.o
- obj-$(CONFIG_KORINA) += korina.o
- obj-$(CONFIG_LANTIQ_ETOP) += lantiq_etop.o
- obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/
--obj-$(CONFIG_NET_VENDOR_MEDIATEK) += mediatek/
-+obj-$(CONFIG_NET_VENDOR_MEDIATEK) += mtk/
- obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
- obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/
- obj-$(CONFIG_NET_VENDOR_MICROCHIP) += microchip/
-- 
2.30.2