[openwrt/openwrt] generic: import rtl8261n patches from mediatek
LEDE Commits
lede-commits at lists.infradead.org
Sun Mar 16 11:08:53 PDT 2025
hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/054b8701966abf445db4f5db2480c6d0bcb192a0
commit 054b8701966abf445db4f5db2480c6d0bcb192a0
Author: Andrew LaMarche <andrewjlamarche at gmail.com>
AuthorDate: Tue Mar 4 19:18:08 2025 +0000
generic: import rtl8261n patches from mediatek
RTL8261N is used on some Airoha and Realtek devices. Move the driver
from Mediatek to generic so it can be used everywhere.
Signed-off-by: Andrew LaMarche <andrewjlamarche at gmail.com>
Link: https://github.com/openwrt/openwrt/pull/18163
Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
target/linux/generic/config-6.6 | 1 +
.../files}/drivers/net/phy/rtl8261n/Kconfig | 0
.../files}/drivers/net/phy/rtl8261n/Makefile | 0
.../drivers/net/phy/rtl8261n/construct/conf_rtl8261n_c.c | 0
.../files}/drivers/net/phy/rtl8261n/construct/conf_rtl8264b.c | 0
.../files}/drivers/net/phy/rtl8261n/error.h | 0
.../files}/drivers/net/phy/rtl8261n/phy_patch.c | 0
.../files}/drivers/net/phy/rtl8261n/phy_patch.h | 0
.../files}/drivers/net/phy/rtl8261n/phy_rtl826xb_patch.c | 0
.../files}/drivers/net/phy/rtl8261n/phy_rtl826xb_patch.h | 0
.../files}/drivers/net/phy/rtl8261n/rtk_osal.c | 0
.../files}/drivers/net/phy/rtl8261n/rtk_osal.h | 0
.../files}/drivers/net/phy/rtl8261n/rtk_phy.c | 0
.../files}/drivers/net/phy/rtl8261n/rtk_phylib.c | 0
.../files}/drivers/net/phy/rtl8261n/rtk_phylib.h | 0
.../files}/drivers/net/phy/rtl8261n/rtk_phylib_def.h | 0
.../files}/drivers/net/phy/rtl8261n/rtk_phylib_rtl826xb.c | 0
.../files}/drivers/net/phy/rtl8261n/rtk_phylib_rtl826xb.h | 0
.../files}/drivers/net/phy/rtl8261n/type.h | 0
.../hack-6.6}/735-net-phy-realtek-rtl8261n.patch | 4 ++--
target/linux/mediatek/mt7622/config-6.6 | 1 -
target/linux/mediatek/mt7623/config-6.6 | 1 -
target/linux/mediatek/mt7629/config-6.6 | 1 -
.../mediatek/patches-6.6/500-gsw-rtl8367s-mt7622-support.patch | 6 +++---
target/linux/realtek/patches-6.6/720-add-rtl-phy.patch | 10 +++++-----
...-net-phy-add-support-for-Siflower-SF23P1211-SF23P1240.patch | 4 ++--
26 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/target/linux/generic/config-6.6 b/target/linux/generic/config-6.6
index 5051a8aba2..5792096073 100644
--- a/target/linux/generic/config-6.6
+++ b/target/linux/generic/config-6.6
@@ -5147,6 +5147,7 @@ CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
# CONFIG_RTL8187 is not set
# CONFIG_RTL8192E is not set
# CONFIG_RTL8192U 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/mediatek/files-6.6/drivers/net/phy/rtl8261n/Kconfig b/target/linux/generic/files/drivers/net/phy/rtl8261n/Kconfig
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/Kconfig
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/Kconfig
diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/Makefile b/target/linux/generic/files/drivers/net/phy/rtl8261n/Makefile
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/Makefile
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/Makefile
diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/construct/conf_rtl8261n_c.c b/target/linux/generic/files/drivers/net/phy/rtl8261n/construct/conf_rtl8261n_c.c
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/construct/conf_rtl8261n_c.c
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/construct/conf_rtl8261n_c.c
diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/construct/conf_rtl8264b.c b/target/linux/generic/files/drivers/net/phy/rtl8261n/construct/conf_rtl8264b.c
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/construct/conf_rtl8264b.c
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/construct/conf_rtl8264b.c
diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/error.h b/target/linux/generic/files/drivers/net/phy/rtl8261n/error.h
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/error.h
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/error.h
diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/phy_patch.c b/target/linux/generic/files/drivers/net/phy/rtl8261n/phy_patch.c
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/phy_patch.c
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/phy_patch.c
diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/phy_patch.h b/target/linux/generic/files/drivers/net/phy/rtl8261n/phy_patch.h
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/phy_patch.h
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/phy_patch.h
diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/phy_rtl826xb_patch.c b/target/linux/generic/files/drivers/net/phy/rtl8261n/phy_rtl826xb_patch.c
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/phy_rtl826xb_patch.c
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/phy_rtl826xb_patch.c
diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/phy_rtl826xb_patch.h b/target/linux/generic/files/drivers/net/phy/rtl8261n/phy_rtl826xb_patch.h
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/phy_rtl826xb_patch.h
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/phy_rtl826xb_patch.h
diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_osal.c b/target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_osal.c
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_osal.c
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_osal.c
diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_osal.h b/target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_osal.h
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_osal.h
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_osal.h
diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_phy.c b/target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phy.c
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_phy.c
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phy.c
diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_phylib.c b/target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib.c
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_phylib.c
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib.c
diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_phylib.h b/target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib.h
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_phylib.h
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib.h
diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_phylib_def.h b/target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib_def.h
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_phylib_def.h
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib_def.h
diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_phylib_rtl826xb.c b/target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib_rtl826xb.c
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_phylib_rtl826xb.c
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib_rtl826xb.c
diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_phylib_rtl826xb.h b/target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib_rtl826xb.h
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_phylib_rtl826xb.h
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib_rtl826xb.h
diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/type.h b/target/linux/generic/files/drivers/net/phy/rtl8261n/type.h
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/type.h
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/type.h
diff --git a/target/linux/mediatek/patches-6.6/735-net-phy-realtek-rtl8261n.patch b/target/linux/generic/hack-6.6/735-net-phy-realtek-rtl8261n.patch
similarity index 87%
rename from target/linux/mediatek/patches-6.6/735-net-phy-realtek-rtl8261n.patch
rename to target/linux/generic/hack-6.6/735-net-phy-realtek-rtl8261n.patch
index 676bd7c093..946869c303 100644
--- a/target/linux/mediatek/patches-6.6/735-net-phy-realtek-rtl8261n.patch
+++ b/target/linux/generic/hack-6.6/735-net-phy-realtek-rtl8261n.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -396,6 +396,8 @@ config QSEMI_PHY
+@@ -406,6 +406,8 @@ config QSEMI_PHY
source "drivers/net/phy/realtek/Kconfig"
@@ -18,4 +18,4 @@
+obj-y += rtl8261n/
obj-$(CONFIG_RENESAS_PHY) += uPD60620.o
obj-$(CONFIG_ROCKCHIP_PHY) += rockchip.o
- obj-$(CONFIG_RTL8367S_GSW) += rtk/
+ obj-$(CONFIG_SMSC_PHY) += smsc.o
diff --git a/target/linux/mediatek/mt7622/config-6.6 b/target/linux/mediatek/mt7622/config-6.6
index 9b9ae63427..71a6479d85 100644
--- a/target/linux/mediatek/mt7622/config-6.6
+++ b/target/linux/mediatek/mt7622/config-6.6
@@ -423,7 +423,6 @@ CONFIG_RPS=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_MT7622=y
CONFIG_RTC_I2C_AND_SPI=y
-# CONFIG_RTL8261N_PHY is not set
CONFIG_RTL8367S_GSW=y
CONFIG_RWSEM_SPIN_ON_OWNER=y
CONFIG_SCHED_MC=y
diff --git a/target/linux/mediatek/mt7623/config-6.6 b/target/linux/mediatek/mt7623/config-6.6
index 94372767a6..4dd1ee3631 100644
--- a/target/linux/mediatek/mt7623/config-6.6
+++ b/target/linux/mediatek/mt7623/config-6.6
@@ -528,7 +528,6 @@ CONFIG_RTC_CLASS=y
# CONFIG_RTC_DRV_MT7622 is not set
CONFIG_RTC_I2C_AND_SPI=y
CONFIG_RTC_MC146818_LIB=y
-# CONFIG_RTL8261N_PHY is not set
# CONFIG_RTL8367S_GSW is not set
CONFIG_RWSEM_SPIN_ON_OWNER=y
# CONFIG_SERIAL_8250_DMA is not set
diff --git a/target/linux/mediatek/mt7629/config-6.6 b/target/linux/mediatek/mt7629/config-6.6
index 008e57a20c..56ea36f27e 100644
--- a/target/linux/mediatek/mt7629/config-6.6
+++ b/target/linux/mediatek/mt7629/config-6.6
@@ -299,7 +299,6 @@ CONFIG_REGMAP_MMIO=y
CONFIG_RESET_CONTROLLER=y
CONFIG_RFS_ACCEL=y
CONFIG_RPS=y
-# CONFIG_RTL8261N_PHY is not set
# CONFIG_RTL8367S_GSW is not set
CONFIG_RWSEM_SPIN_ON_OWNER=y
CONFIG_SCSI=y
diff --git a/target/linux/mediatek/patches-6.6/500-gsw-rtl8367s-mt7622-support.patch b/target/linux/mediatek/patches-6.6/500-gsw-rtl8367s-mt7622-support.patch
index bb7e7be6d2..639403807f 100644
--- a/target/linux/mediatek/patches-6.6/500-gsw-rtl8367s-mt7622-support.patch
+++ b/target/linux/mediatek/patches-6.6/500-gsw-rtl8367s-mt7622-support.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -416,6 +416,12 @@ config ROCKCHIP_PHY
+@@ -418,6 +418,12 @@ config ROCKCHIP_PHY
help
Currently supports the integrated Ethernet PHY.
@@ -15,8 +15,8 @@
select CRC16
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
-@@ -102,6 +102,7 @@ obj-$(CONFIG_QSEMI_PHY) += qsemi.o
- obj-$(CONFIG_REALTEK_PHY) += realtek/
+@@ -103,6 +103,7 @@ obj-$(CONFIG_REALTEK_PHY) += realtek/
+ obj-y += rtl8261n/
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.6/720-add-rtl-phy.patch b/target/linux/realtek/patches-6.6/720-add-rtl-phy.patch
index 4d6866db24..c7078cea4e 100644
--- a/target/linux/realtek/patches-6.6/720-add-rtl-phy.patch
+++ b/target/linux/realtek/patches-6.6/720-add-rtl-phy.patch
@@ -14,9 +14,9 @@ Submitted-by: Birger Koblitz <mail at birger-koblitz.de>
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -407,6 +407,12 @@ config QSEMI_PHY
+@@ -409,6 +409,12 @@ source "drivers/net/phy/realtek/Kconfig"
- source "drivers/net/phy/realtek/Kconfig"
+ source "drivers/net/phy/rtl8261n/Kconfig"
+config REALTEK_SOC_PHY
+ tristate "Realtek SoC PHYs"
@@ -29,11 +29,11 @@ Submitted-by: Birger Koblitz <mail at birger-koblitz.de>
help
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
-@@ -100,6 +100,7 @@ obj-$(CONFIG_NXP_TJA11XX_PHY) += nxp-tja
- obj-y += qcom/
+@@ -101,6 +101,7 @@ obj-y += qcom/
obj-$(CONFIG_QSEMI_PHY) += qsemi.o
obj-$(CONFIG_REALTEK_PHY) += realtek/
-+obj-$(CONFIG_REALTEK_SOC_PHY) += rtl83xx-phy.o
+ obj-y += rtl8261n/
++obj-$(CONFIG_REALTEK_SOC_PHY) += rtl83xx-phy.o
obj-$(CONFIG_RENESAS_PHY) += uPD60620.o
obj-$(CONFIG_ROCKCHIP_PHY) += rockchip.o
obj-$(CONFIG_SMSC_PHY) += smsc.o
diff --git a/target/linux/siflower/patches-6.6/019-net-phy-add-support-for-Siflower-SF23P1211-SF23P1240.patch b/target/linux/siflower/patches-6.6/019-net-phy-add-support-for-Siflower-SF23P1211-SF23P1240.patch
index 70c60ad726..4113d82326 100644
--- a/target/linux/siflower/patches-6.6/019-net-phy-add-support-for-Siflower-SF23P1211-SF23P1240.patch
+++ b/target/linux/siflower/patches-6.6/019-net-phy-add-support-for-Siflower-SF23P1211-SF23P1240.patch
@@ -11,7 +11,7 @@ Signed-off-by: haoming.chen <haoming.chen at siflower.com.cn>
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -482,3 +482,8 @@ endif # PHYLIB
+@@ -484,3 +484,8 @@ endif # PHYLIB
config MICREL_KS8995MA
tristate "Micrel KS8995MA 5-ports 10/100 managed Ethernet switch"
depends on SPI
@@ -22,7 +22,7 @@ Signed-off-by: haoming.chen <haoming.chen at siflower.com.cn>
+ Currently supports the SF1211F, SF1240 gigabit PHY.
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
-@@ -107,3 +107,4 @@ obj-$(CONFIG_STE10XP) += ste10Xp.o
+@@ -108,3 +108,4 @@ obj-$(CONFIG_STE10XP) += ste10Xp.o
obj-$(CONFIG_TERANETICS_PHY) += teranetics.o
obj-$(CONFIG_VITESSE_PHY) += vitesse.o
obj-$(CONFIG_XILINX_GMII2RGMII) += xilinx_gmii2rgmii.o
More information about the lede-commits
mailing list