generic: 6.18: drop downstream RTL8261N driver

Now that the upstream RealTek PHY driver is patched to support also
the new 5G and 10G PHYs we can start to phase-out the messy downstream
driver.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk
index 092c12d131cf64b842830865d0a90235b8161595..a4d16a2dfbe72bd3a25f56a2464e8da522ab94b8 100644 (file)
--- a/package/kernel/linux/modules/netdevices.mk
+++ b/package/kernel/linux/modules/netdevices.mk
@@ -579,7 +579,7 @@ define KernelPackage/phy-rtl8261n
    SUBMENU:=$(NETWORK_DEVICES_MENU)
    TITLE:=Realtek RTL8261N NBASE-T PHY driver
    KCONFIG:=CONFIG_RTL8261N_PHY
-   DEPENDS:=+kmod-libphy
+   DEPENDS:=@LINUX_6_12 +kmod-libphy
    FILES:=$(LINUX_DIR)/drivers/net/phy/rtl8261n/rtl8261n.ko
    AUTOLOAD:=$(call AutoLoad,18,rtl8261n,1)
 endef

diff --git a/target/linux/generic/config-6.18 b/target/linux/generic/config-6.18
index af27e8b077f8a0b1df95341a9bffd97e9cfcb461..7a5bf77ef5f27c81188477f7b25dbbbb9b0ec525 100644 (file)
--- a/target/linux/generic/config-6.18
+++ b/target/linux/generic/config-6.18
@@ -5524,7 +5524,6 @@ CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 # CONFIG_RTL8180 is not set
 # CONFIG_RTL8187 is not set
 # CONFIG_RTL8192E is not set
-# CONFIG_RTL8261N_PHY is not set
 # CONFIG_RTL8306_PHY is not set
 # CONFIG_RTL8366RB_PHY is not set
 # CONFIG_RTL8366S_PHY is not set

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8261n/Kconfig b/target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/Kconfig
similarity index 100%
rename from target/linux/generic/files/drivers/net/phy/rtl8261n/Kconfig
rename to target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/Kconfig

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8261n/Makefile b/target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/Makefile
similarity index 100%
rename from target/linux/generic/files/drivers/net/phy/rtl8261n/Makefile
rename to target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/Makefile

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8261n/construct/conf_rtl8261n_c.c b/target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/construct/conf_rtl8261n_c.c
similarity index 100%
rename from target/linux/generic/files/drivers/net/phy/rtl8261n/construct/conf_rtl8261n_c.c
rename to target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/construct/conf_rtl8261n_c.c

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8261n/construct/conf_rtl8264b.c b/target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/construct/conf_rtl8264b.c
similarity index 100%
rename from target/linux/generic/files/drivers/net/phy/rtl8261n/construct/conf_rtl8264b.c
rename to target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/construct/conf_rtl8264b.c

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8261n/error.h b/target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/error.h
similarity index 100%
rename from target/linux/generic/files/drivers/net/phy/rtl8261n/error.h
rename to target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/error.h

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8261n/phy_patch.c b/target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/phy_patch.c
similarity index 100%
rename from target/linux/generic/files/drivers/net/phy/rtl8261n/phy_patch.c
rename to target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/phy_patch.c

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8261n/phy_patch.h b/target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/phy_patch.h
similarity index 100%
rename from target/linux/generic/files/drivers/net/phy/rtl8261n/phy_patch.h
rename to target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/phy_patch.h

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8261n/phy_rtl826xb_patch.c b/target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/phy_rtl826xb_patch.c
similarity index 100%
rename from target/linux/generic/files/drivers/net/phy/rtl8261n/phy_rtl826xb_patch.c
rename to target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/phy_rtl826xb_patch.c

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8261n/phy_rtl826xb_patch.h b/target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/phy_rtl826xb_patch.h
similarity index 100%
rename from target/linux/generic/files/drivers/net/phy/rtl8261n/phy_rtl826xb_patch.h
rename to target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/phy_rtl826xb_patch.h

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_osal.c b/target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/rtk_osal.c
similarity index 100%
rename from target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_osal.c
rename to target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/rtk_osal.c

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_osal.h b/target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/rtk_osal.h
similarity index 100%
rename from target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_osal.h
rename to target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/rtk_osal.h

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phy.c b/target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/rtk_phy.c
similarity index 100%
rename from target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phy.c
rename to target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/rtk_phy.c

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib.c b/target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/rtk_phylib.c
similarity index 100%
rename from target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib.c
rename to target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/rtk_phylib.c

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib.h b/target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/rtk_phylib.h
similarity index 100%
rename from target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib.h
rename to target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/rtk_phylib.h

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib_def.h b/target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/rtk_phylib_def.h
similarity index 100%
rename from target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib_def.h
rename to target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/rtk_phylib_def.h

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib_rtl826xb.c b/target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/rtk_phylib_rtl826xb.c
similarity index 100%
rename from target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib_rtl826xb.c
rename to target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/rtk_phylib_rtl826xb.c

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib_rtl826xb.h b/target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/rtk_phylib_rtl826xb.h
similarity index 100%
rename from target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib_rtl826xb.h
rename to target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/rtk_phylib_rtl826xb.h

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8261n/type.h b/target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/type.h
similarity index 100%
rename from target/linux/generic/files/drivers/net/phy/rtl8261n/type.h
rename to target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/type.h

diff --git a/target/linux/generic/hack-6.18/735-net-phy-realtek-rtl8261n.patch b/target/linux/generic/hack-6.18/735-net-phy-realtek-rtl8261n.patch
deleted file mode 100644 (file)
index eafa39b..0000000
--- a/target/linux/generic/hack-6.18/735-net-phy-realtek-rtl8261n.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: John Crispin <john@phrozen.org>
-Date: Tue, 29 Oct 2024 13:37:40 +0100
-Subject: [PATCH] net: add support for Realtek RTL8261n 10G PHYs
-
-There is no upstream driver yet. Merge the RTL SDK driver for now.
-
-Signed-off-by: John Crispin <john@phrozen.org>
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -459,6 +459,8 @@ config QSEMI_PHY
- 
- source "drivers/net/phy/realtek/Kconfig"
- 
-+source "drivers/net/phy/rtl8261n/Kconfig"
-+
- config RENESAS_PHY
-       tristate "Renesas PHYs"
-       help
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -106,6 +106,7 @@ obj-$(CONFIG_NXP_TJA11XX_PHY)      += nxp-tja
- obj-y                         += qcom/
- obj-$(CONFIG_QSEMI_PHY)               += qsemi.o
- obj-$(CONFIG_REALTEK_PHY)     += realtek/
-+obj-y                         += rtl8261n/
- obj-$(CONFIG_RENESAS_PHY)     += uPD60620.o
- obj-$(CONFIG_ROCKCHIP_PHY)    += rockchip.o
- obj-$(CONFIG_SMSC_PHY)                += smsc.o

diff --git a/target/linux/mediatek/patches-6.18/500-gsw-rtl8367s-mt7622-support.patch b/target/linux/mediatek/patches-6.18/500-gsw-rtl8367s-mt7622-support.patch
index ceffc0d114967d8eafee6ed4a0ab29e4cc688766..a8ca5781d27a9bba94166f5a7cbbe0605fa8511b 100644 (file)
--- a/target/linux/mediatek/patches-6.18/500-gsw-rtl8367s-mt7622-support.patch
+++ b/target/linux/mediatek/patches-6.18/500-gsw-rtl8367s-mt7622-support.patch
@@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -471,6 +471,12 @@ config ROCKCHIP_PHY
+@@ -469,6 +469,12 @@ config ROCKCHIP_PHY
        help
          Currently supports the integrated Ethernet PHY.
  
@@ -26,8 +26,8 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        select CRC16
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
-@@ -109,6 +109,7 @@ obj-$(CONFIG_REALTEK_PHY)  += realtek/
- obj-y                         += rtl8261n/
+@@ -108,6 +108,7 @@ obj-$(CONFIG_QSEMI_PHY)            += qsemi.o
+ obj-$(CONFIG_REALTEK_PHY)     += realtek/
  obj-$(CONFIG_RENESAS_PHY)     += uPD60620.o
  obj-$(CONFIG_ROCKCHIP_PHY)    += rockchip.o
 +obj-$(CONFIG_RTL8367S_GSW)    += rtk/

diff --git a/target/linux/realtek/patches-6.18/720-add-rtl-phy.patch b/target/linux/realtek/patches-6.18/720-add-rtl-phy.patch
index 925e7f96d13c1346db3732f8b050d03890a0397d..0261cf8f4f345c84eac28271af010595ea8ffbb9 100644 (file)
--- a/target/linux/realtek/patches-6.18/720-add-rtl-phy.patch
+++ b/target/linux/realtek/patches-6.18/720-add-rtl-phy.patch
@@ -38,6 +38,6 @@ Submitted-by: Birger Koblitz <mail@birger-koblitz.de>
  obj-$(CONFIG_QSEMI_PHY)               += qsemi.o
 -obj-$(CONFIG_REALTEK_PHY)     += realtek/
 +obj-y                         += realtek/
- obj-y                         += rtl8261n/
  obj-$(CONFIG_RENESAS_PHY)     += uPD60620.o
  obj-$(CONFIG_ROCKCHIP_PHY)    += rockchip.o
+ obj-$(CONFIG_SMSC_PHY)                += smsc.o