From: Markus Stockhausen Date: Sun, 8 Feb 2026 16:01:06 +0000 (+0100) Subject: realtek: phy: rename and relocate module X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59b172c3c44afb08a29f4baff25b93687812eff6;p=thirdparty%2Fopenwrt.git realtek: phy: rename and relocate module The downstream Realtek phy module is currently known as rtl83xx-phy.c and its kernel config REALTEK_SOC_PHY. It has been simplified, cleaned and now aligns to Realtek main module (upstream Realtek phy). It is no longer tied to the Realtek switch SoC but serves as generic module for 1Gbit multiport phys. Adapt it as follows: - place it into the realtek folder aside its upstream sibling - rename it to realtek_multiport.c - remove SoC dependency in Kconfig and Makefile - change kernel configs for the targets accordingly Signed-off-by: Markus Stockhausen Link: https://github.com/openwrt/openwrt/pull/21929 Signed-off-by: Robert Marko --- diff --git a/target/linux/realtek/files-6.12/drivers/net/phy/rtl83xx-phy.c b/target/linux/realtek/files-6.12/drivers/net/phy/realtek/realtek_multiport.c similarity index 100% rename from target/linux/realtek/files-6.12/drivers/net/phy/rtl83xx-phy.c rename to target/linux/realtek/files-6.12/drivers/net/phy/realtek/realtek_multiport.c diff --git a/target/linux/realtek/patches-6.12/720-add-rtl-phy.patch b/target/linux/realtek/patches-6.12/720-add-rtl-phy.patch index 3afab6e1f71..fdaf5cfe752 100644 --- a/target/linux/realtek/patches-6.12/720-add-rtl-phy.patch +++ b/target/linux/realtek/patches-6.12/720-add-rtl-phy.patch @@ -7,33 +7,35 @@ This fixes the build problems for the REALTEK target by adding a proper configuration option for the phy module. Submitted-by: Birger Koblitz ---- - drivers/net/phy/Kconfig | 6 ++++++ - drivers/net/phy/Makefile | 1 + - 2 files changed, 7 insertions(+) - ---- a/drivers/net/phy/Kconfig -+++ b/drivers/net/phy/Kconfig -@@ -434,6 +434,12 @@ source "drivers/net/phy/realtek/Kconfig" - - source "drivers/net/phy/rtl8261n/Kconfig" +--- a/drivers/net/phy/realtek/Makefile ++++ b/drivers/net/phy/realtek/Makefile +@@ -2,3 +2,4 @@ + realtek-y += realtek_main.o + realtek-$(CONFIG_REALTEK_PHY_HWMON) += realtek_hwmon.o + obj-$(CONFIG_REALTEK_PHY) += realtek.o ++obj-$(CONFIG_REALTEK_PHY_MULTIPORT) += realtek_multiport.o +--- a/drivers/net/phy/realtek/Kconfig ++++ b/drivers/net/phy/realtek/Kconfig +@@ -4,6 +4,11 @@ config REALTEK_PHY + help + Currently supports RTL821x/RTL822x and fast ethernet PHYs -+config REALTEK_SOC_PHY -+ tristate "Realtek SoC PHYs" -+ depends on MACH_REALTEK_RTL ++config REALTEK_PHY_MULTIPORT ++ tristate "Realtek multiport PHYs" + help -+ Supports the PHYs found in combination with Realtek Switch SoCs ++ Currently supports RTL8214x/RTL8218x gigabit multiport PHYs + - config RENESAS_PHY - tristate "Renesas PHYs" - help + if REALTEK_PHY + + config REALTEK_PHY_HWMON --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile -@@ -111,6 +111,7 @@ obj-y += qcom/ +@@ -109,7 +109,7 @@ obj-$(CONFIG_NXP_CBTX_PHY) += nxp-cbtx.o + obj-$(CONFIG_NXP_TJA11XX_PHY) += nxp-tja11xx.o + obj-y += qcom/ obj-$(CONFIG_QSEMI_PHY) += qsemi.o - obj-$(CONFIG_REALTEK_PHY) += realtek/ +-obj-$(CONFIG_REALTEK_PHY) += realtek/ ++obj-y += realtek/ 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/realtek/rtl838x/config-6.12 b/target/linux/realtek/rtl838x/config-6.12 index 538b44ce186..0fbf6872bf6 100644 --- a/target/linux/realtek/rtl838x/config-6.12 +++ b/target/linux/realtek/rtl838x/config-6.12 @@ -214,7 +214,7 @@ CONFIG_REALTEK_OTTO_TIMER=y CONFIG_REALTEK_OTTO_WDT=y CONFIG_REALTEK_PHY=y CONFIG_REALTEK_PHY_HWMON=y -CONFIG_REALTEK_SOC_PHY=y +CONFIG_REALTEK_PHY_MULTIPORT=y CONFIG_REALTEK_THERMAL=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=y diff --git a/target/linux/realtek/rtl839x/config-6.12 b/target/linux/realtek/rtl839x/config-6.12 index 2651a42d2e2..3a02b7778ab 100644 --- a/target/linux/realtek/rtl839x/config-6.12 +++ b/target/linux/realtek/rtl839x/config-6.12 @@ -225,7 +225,7 @@ CONFIG_REALTEK_OTTO_TIMER=y CONFIG_REALTEK_OTTO_WDT=y CONFIG_REALTEK_PHY=y CONFIG_REALTEK_PHY_HWMON=y -CONFIG_REALTEK_SOC_PHY=y +CONFIG_REALTEK_PHY_MULTIPORT=y CONFIG_REALTEK_THERMAL=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=y diff --git a/target/linux/realtek/rtl930x/config-6.12 b/target/linux/realtek/rtl930x/config-6.12 index ce58654015a..9baf234524a 100644 --- a/target/linux/realtek/rtl930x/config-6.12 +++ b/target/linux/realtek/rtl930x/config-6.12 @@ -204,7 +204,7 @@ CONFIG_REALTEK_OTTO_TIMER=y CONFIG_REALTEK_OTTO_WDT=y CONFIG_REALTEK_PHY=y CONFIG_REALTEK_PHY_HWMON=y -CONFIG_REALTEK_SOC_PHY=y +CONFIG_REALTEK_PHY_MULTIPORT=y CONFIG_REALTEK_THERMAL=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=y diff --git a/target/linux/realtek/rtl930x_nand/config-6.12 b/target/linux/realtek/rtl930x_nand/config-6.12 index 8cd4db24d74..054beb57919 100644 --- a/target/linux/realtek/rtl930x_nand/config-6.12 +++ b/target/linux/realtek/rtl930x_nand/config-6.12 @@ -209,7 +209,7 @@ CONFIG_REALTEK_OTTO_TIMER=y CONFIG_REALTEK_OTTO_WDT=y CONFIG_REALTEK_PHY=y CONFIG_REALTEK_PHY_HWMON=y -CONFIG_REALTEK_SOC_PHY=y +CONFIG_REALTEK_PHY_MULTIPORT=y CONFIG_REALTEK_THERMAL=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=y diff --git a/target/linux/realtek/rtl931x/config-6.12 b/target/linux/realtek/rtl931x/config-6.12 index 60f3a6067c8..30e03db3c20 100644 --- a/target/linux/realtek/rtl931x/config-6.12 +++ b/target/linux/realtek/rtl931x/config-6.12 @@ -216,7 +216,7 @@ CONFIG_REALTEK_OTTO_TIMER=y CONFIG_REALTEK_OTTO_WDT=y CONFIG_REALTEK_PHY=y CONFIG_REALTEK_PHY_HWMON=y -CONFIG_REALTEK_SOC_PHY=y +CONFIG_REALTEK_PHY_MULTIPORT=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=y CONFIG_REGMAP_MMIO=y diff --git a/target/linux/realtek/rtl931x_nand/config-6.12 b/target/linux/realtek/rtl931x_nand/config-6.12 index dfe46a968f2..38d7dfdea7e 100644 --- a/target/linux/realtek/rtl931x_nand/config-6.12 +++ b/target/linux/realtek/rtl931x_nand/config-6.12 @@ -220,7 +220,7 @@ CONFIG_RANDSTRUCT_NONE=y CONFIG_RATIONAL=y CONFIG_REALTEK_OTTO_TIMER=y CONFIG_REALTEK_OTTO_WDT=y -CONFIG_REALTEK_SOC_PHY=y +CONFIG_REALTEK_PHY_MULTIPORT=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=y CONFIG_REGMAP_MMIO=y