catspeed-cc/openwrt
1
1
Fork 0
Code

generic: 6.18: drop downstream RTL8261N driver

Browse Source 
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>
This commit is contained in:
Daniel Golle 2026-05-18 13:03:23 +01:00
parent 6369c9e5c7
commit 8c264cf222
23 changed files with 5 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/kernel/linux/modules/netdevices.mk
View File

@ -579,7 +579,7 @@ define KernelPackage/phy-rtl8261n
SUBMENU:=$(NETWORK_DEVICES_MENU) SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=Realtek RTL8261N NBASE-T PHY driver TITLE:=Realtek RTL8261N NBASE-T PHY driver
KCONFIG:=CONFIG_RTL8261N_PHY KCONFIG:=CONFIG_RTL8261N_PHY
DEPENDS:=+kmod-libphy DEPENDS:=@LINUX_6_12 +kmod-libphy
FILES:=$(LINUX_DIR)/drivers/net/phy/rtl8261n/rtl8261n.ko FILES:=$(LINUX_DIR)/drivers/net/phy/rtl8261n/rtl8261n.ko
AUTOLOAD:=$(call AutoLoad,18,rtl8261n,1) AUTOLOAD:=$(call AutoLoad,18,rtl8261n,1)
endef endef

1
target/linux/generic/config-6.18
View File

@ -5524,7 +5524,6 @@ CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
# CONFIG_RTL8180 is not set # CONFIG_RTL8180 is not set
# CONFIG_RTL8187 is not set # CONFIG_RTL8187 is not set
# CONFIG_RTL8192E is not set # CONFIG_RTL8192E is not set
# CONFIG_RTL8261N_PHY is not set
# CONFIG_RTL8306_PHY is not set # CONFIG_RTL8306_PHY is not set
# CONFIG_RTL8366RB_PHY is not set # CONFIG_RTL8366RB_PHY is not set
# CONFIG_RTL8366S_PHY is not set # CONFIG_RTL8366S_PHY is not set

0
target/linux/generic/files/drivers/net/phy/rtl8261n/Kconfig → target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/Kconfig
View File

0
target/linux/generic/files/drivers/net/phy/rtl8261n/Makefile → target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/Makefile
View File

0
target/linux/generic/files/drivers/net/phy/rtl8261n/construct/conf_rtl8261n_c.c → target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/construct/conf_rtl8261n_c.c
View File

0
target/linux/generic/files/drivers/net/phy/rtl8261n/construct/conf_rtl8264b.c → target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/construct/conf_rtl8264b.c
View File

0
target/linux/generic/files/drivers/net/phy/rtl8261n/error.h → target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/error.h
View File

0
target/linux/generic/files/drivers/net/phy/rtl8261n/phy_patch.c → target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/phy_patch.c
View File

0
target/linux/generic/files/drivers/net/phy/rtl8261n/phy_patch.h → target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/phy_patch.h
View File

0
target/linux/generic/files/drivers/net/phy/rtl8261n/phy_rtl826xb_patch.c → target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/phy_rtl826xb_patch.c
View File

0
target/linux/generic/files/drivers/net/phy/rtl8261n/phy_rtl826xb_patch.h → target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/phy_rtl826xb_patch.h
View File

0
target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_osal.c → target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/rtk_osal.c
View File

0
target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_osal.h → target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/rtk_osal.h
View File

0
target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phy.c → target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/rtk_phy.c
View File

0
target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib.c → target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/rtk_phylib.c
View File

0
target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib.h → target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/rtk_phylib.h
View File

0
target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib_def.h → target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/rtk_phylib_def.h
View File

0
target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib_rtl826xb.c → target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/rtk_phylib_rtl826xb.c
View File

0
target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib_rtl826xb.h → target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/rtk_phylib_rtl826xb.h
View File

0
target/linux/generic/files/drivers/net/phy/rtl8261n/type.h → target/linux/generic/files-6.12/drivers/net/phy/rtl8261n/type.h
View File

28
target/linux/generic/hack-6.18/735-net-phy-realtek-rtl8261n.patch
View File

@ -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

6
target/linux/mediatek/patches-6.18/500-gsw-rtl8367s-mt7622-support.patch
View File

@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- ---
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig
@@ -471,6 +471,12 @@ config ROCKCHIP_PHY @@ -469,6 +469,12 @@ config ROCKCHIP_PHY
help help
Currently supports the integrated Ethernet PHY. Currently supports the integrated Ethernet PHY.
@ -26,8 +26,8 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
select CRC16 select CRC16
--- a/drivers/net/phy/Makefile --- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile
@@ -109,6 +109,7 @@ obj-$(CONFIG_REALTEK_PHY) += realtek/ @@ -108,6 +108,7 @@ obj-$(CONFIG_QSEMI_PHY) += qsemi.o
obj-y += rtl8261n/ obj-$(CONFIG_REALTEK_PHY) += realtek/
obj-$(CONFIG_RENESAS_PHY) += uPD60620.o obj-$(CONFIG_RENESAS_PHY) += uPD60620.o
obj-$(CONFIG_ROCKCHIP_PHY) += rockchip.o obj-$(CONFIG_ROCKCHIP_PHY) += rockchip.o
+obj-$(CONFIG_RTL8367S_GSW) += rtk/ +obj-$(CONFIG_RTL8367S_GSW) += rtk/

2
target/linux/realtek/patches-6.18/720-add-rtl-phy.patch
View File

@ -38,6 +38,6 @@ Submitted-by: Birger Koblitz <mail@birger-koblitz.de>
obj-$(CONFIG_QSEMI_PHY) += qsemi.o obj-$(CONFIG_QSEMI_PHY) += qsemi.o
-obj-$(CONFIG_REALTEK_PHY) += realtek/ -obj-$(CONFIG_REALTEK_PHY) += realtek/
+obj-y += realtek/ +obj-y += realtek/
obj-y += rtl8261n/
obj-$(CONFIG_RENESAS_PHY) += uPD60620.o obj-$(CONFIG_RENESAS_PHY) += uPD60620.o
obj-$(CONFIG_ROCKCHIP_PHY) += rockchip.o obj-$(CONFIG_ROCKCHIP_PHY) += rockchip.o
obj-$(CONFIG_SMSC_PHY) += smsc.o