From: Markus Stockhausen Date: Tue, 27 May 2025 18:08:32 +0000 (-0400) Subject: realtek: 6.12: refresh patches with only source line changes X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=081786887b8078087dfb620a9291e6a601a323b7;p=thirdparty%2Fopenwrt.git realtek: 6.12: refresh patches with only source line changes All these patches needed no manual intervention and applied cleanly with new source code positions. Signed-off-by: Markus Stockhausen Link: https://github.com/openwrt/openwrt/pull/18935 Signed-off-by: Robert Marko --- diff --git a/target/linux/realtek/patches-6.12/310-add-i2c-rtl9300-support.patch b/target/linux/realtek/patches-6.12/310-add-i2c-rtl9300-support.patch index 9eaed95d0df..4a56675bdf3 100644 --- a/target/linux/realtek/patches-6.12/310-add-i2c-rtl9300-support.patch +++ b/target/linux/realtek/patches-6.12/310-add-i2c-rtl9300-support.patch @@ -17,7 +17,7 @@ Submitted-by: Birger Koblitz --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig -@@ -1023,6 +1023,16 @@ config I2C_RK3X +@@ -1061,6 +1061,16 @@ config I2C_RK3X This driver can also be built as a module. If so, the module will be called i2c-rk3x. @@ -36,7 +36,7 @@ Submitted-by: Birger Koblitz depends on ARCH_RENESAS || COMPILE_TEST --- a/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile -@@ -101,6 +101,7 @@ obj-$(CONFIG_I2C_QCOM_GENI) += i2c-qcom- +@@ -103,6 +103,7 @@ obj-$(CONFIG_I2C_QCOM_GENI) += i2c-qcom- obj-$(CONFIG_I2C_QUP) += i2c-qup.o obj-$(CONFIG_I2C_RIIC) += i2c-riic.o obj-$(CONFIG_I2C_RK3X) += i2c-rk3x.o diff --git a/target/linux/realtek/patches-6.12/311-add-i2c-mux-rtl9300-support.patch b/target/linux/realtek/patches-6.12/311-add-i2c-mux-rtl9300-support.patch index d0bfba45381..bd773d6b290 100644 --- a/target/linux/realtek/patches-6.12/311-add-i2c-mux-rtl9300-support.patch +++ b/target/linux/realtek/patches-6.12/311-add-i2c-mux-rtl9300-support.patch @@ -37,7 +37,7 @@ Submitted-by: Birger Koblitz depends on PINCTRL && OF --- a/drivers/i2c/muxes/Makefile +++ b/drivers/i2c/muxes/Makefile -@@ -14,5 +14,6 @@ obj-$(CONFIG_I2C_MUX_PCA9541) += i2c-mux +@@ -15,5 +15,6 @@ obj-$(CONFIG_I2C_MUX_PCA9541) += i2c-mux obj-$(CONFIG_I2C_MUX_PCA954x) += i2c-mux-pca954x.o obj-$(CONFIG_I2C_MUX_PINCTRL) += i2c-mux-pinctrl.o obj-$(CONFIG_I2C_MUX_REG) += i2c-mux-reg.o diff --git a/target/linux/realtek/patches-6.12/318-add-rtl83xx-clk-support.patch b/target/linux/realtek/patches-6.12/318-add-rtl83xx-clk-support.patch index e75260a6382..72ac8a58c18 100644 --- a/target/linux/realtek/patches-6.12/318-add-rtl83xx-clk-support.patch +++ b/target/linux/realtek/patches-6.12/318-add-rtl83xx-clk-support.patch @@ -13,7 +13,7 @@ Submitted-by: Markus Stockhausen --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig -@@ -484,6 +484,7 @@ source "drivers/clk/mvebu/Kconfig" +@@ -491,6 +491,7 @@ source "drivers/clk/mvebu/Kconfig" source "drivers/clk/nuvoton/Kconfig" source "drivers/clk/pistachio/Kconfig" source "drivers/clk/qcom/Kconfig" @@ -23,7 +23,7 @@ Submitted-by: Markus Stockhausen source "drivers/clk/rockchip/Kconfig" --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile -@@ -112,6 +112,7 @@ obj-$(CONFIG_COMMON_CLK_PISTACHIO) += pi +@@ -123,6 +123,7 @@ obj-$(CONFIG_COMMON_CLK_PISTACHIO) += pi obj-$(CONFIG_COMMON_CLK_PXA) += pxa/ obj-$(CONFIG_COMMON_CLK_QCOM) += qcom/ obj-y += ralink/ diff --git a/target/linux/realtek/patches-6.12/708-drivers-net-phy-eee-support-for-rtl838x.patch b/target/linux/realtek/patches-6.12/708-drivers-net-phy-eee-support-for-rtl838x.patch index 44461992b17..cee178c0b98 100644 --- a/target/linux/realtek/patches-6.12/708-drivers-net-phy-eee-support-for-rtl838x.patch +++ b/target/linux/realtek/patches-6.12/708-drivers-net-phy-eee-support-for-rtl838x.patch @@ -21,7 +21,7 @@ Submitted-by: John Crispin --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c -@@ -2805,8 +2805,11 @@ int phylink_ethtool_get_eee(struct phyli +@@ -2877,8 +2877,11 @@ int phylink_ethtool_get_eee(struct phyli ASSERT_RTNL(); @@ -34,7 +34,7 @@ Submitted-by: John Crispin return ret; } -@@ -2823,8 +2826,11 @@ int phylink_ethtool_set_eee(struct phyli +@@ -2895,8 +2898,11 @@ int phylink_ethtool_set_eee(struct phyli ASSERT_RTNL(); diff --git a/target/linux/realtek/patches-6.12/712-net-phy-add-an-MDIO-SMBus-library.patch b/target/linux/realtek/patches-6.12/712-net-phy-add-an-MDIO-SMBus-library.patch index 229e2612eae..aede3cf6385 100644 --- a/target/linux/realtek/patches-6.12/712-net-phy-add-an-MDIO-SMBus-library.patch +++ b/target/linux/realtek/patches-6.12/712-net-phy-add-an-MDIO-SMBus-library.patch @@ -389,7 +389,7 @@ Signed-off-by: Antoine Tenart +MODULE_LICENSE("GPL"); --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -65,6 +65,7 @@ config SFP +@@ -76,6 +76,7 @@ config SFP depends on I2C && PHYLINK depends on HWMON || HWMON=n select MDIO_I2C diff --git a/target/linux/realtek/patches-6.12/714-net-phy-sfp-add-support-for-SMBus.patch b/target/linux/realtek/patches-6.12/714-net-phy-sfp-add-support-for-SMBus.patch index 4fb1e7f293a..f88f2b2c23e 100644 --- a/target/linux/realtek/patches-6.12/714-net-phy-sfp-add-support-for-SMBus.patch +++ b/target/linux/realtek/patches-6.12/714-net-phy-sfp-add-support-for-SMBus.patch @@ -10,7 +10,7 @@ Signed-off-by: Antoine Tenart --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c -@@ -675,10 +675,64 @@ static int sfp_i2c_write(struct sfp *sfp +@@ -691,10 +691,64 @@ static int sfp_i2c_write(struct sfp *sfp return ret == ARRAY_SIZE(msgs) ? len : 0; } @@ -77,7 +77,7 @@ Signed-off-by: Antoine Tenart sfp->i2c = i2c; sfp->read = sfp_i2c_read; -@@ -710,6 +764,29 @@ static int sfp_i2c_mdiobus_create(struct +@@ -726,6 +780,29 @@ static int sfp_i2c_mdiobus_create(struct return 0; } @@ -107,7 +107,7 @@ Signed-off-by: Antoine Tenart static void sfp_i2c_mdiobus_destroy(struct sfp *sfp) { mdiobus_unregister(sfp->i2c_mii); -@@ -1884,9 +1961,15 @@ static void sfp_sm_fault(struct sfp *sfp +@@ -1900,9 +1977,15 @@ static void sfp_sm_fault(struct sfp *sfp static int sfp_sm_add_mdio_bus(struct sfp *sfp) { diff --git a/target/linux/realtek/patches-6.12/716-net-ethernet-add-support-for-rtl838x-ethernet.patch b/target/linux/realtek/patches-6.12/716-net-ethernet-add-support-for-rtl838x-ethernet.patch index e0c10bca633..3d7529074d7 100644 --- a/target/linux/realtek/patches-6.12/716-net-ethernet-add-support-for-rtl838x-ethernet.patch +++ b/target/linux/realtek/patches-6.12/716-net-ethernet-add-support-for-rtl838x-ethernet.patch @@ -22,7 +22,7 @@ Submitted-by: John Crispin --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig -@@ -170,6 +170,13 @@ source "drivers/net/ethernet/rdc/Kconfig +@@ -179,6 +179,13 @@ source "drivers/net/ethernet/rdc/Kconfig source "drivers/net/ethernet/realtek/Kconfig" source "drivers/net/ethernet/renesas/Kconfig" source "drivers/net/ethernet/rocker/Kconfig" @@ -38,7 +38,7 @@ Submitted-by: John Crispin source "drivers/net/ethernet/sgi/Kconfig" --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile -@@ -81,6 +81,7 @@ obj-$(CONFIG_NET_VENDOR_REALTEK) += real +@@ -82,6 +82,7 @@ obj-$(CONFIG_NET_VENDOR_REALTEK) += real obj-$(CONFIG_NET_VENDOR_RENESAS) += renesas/ obj-$(CONFIG_NET_VENDOR_RDC) += rdc/ obj-$(CONFIG_NET_VENDOR_ROCKER) += rocker/ 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 c7078cea4e2..3be218635e8 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 @@ -14,7 +14,7 @@ Submitted-by: Birger Koblitz --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -409,6 +409,12 @@ source "drivers/net/phy/realtek/Kconfig" +@@ -422,6 +422,12 @@ source "drivers/net/phy/realtek/Kconfig" source "drivers/net/phy/rtl8261n/Kconfig" @@ -29,7 +29,7 @@ Submitted-by: Birger Koblitz help --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile -@@ -101,6 +101,7 @@ obj-y += qcom/ +@@ -111,6 +111,7 @@ obj-y += qcom/ obj-$(CONFIG_QSEMI_PHY) += qsemi.o obj-$(CONFIG_REALTEK_PHY) += realtek/ obj-y += rtl8261n/ diff --git a/target/linux/realtek/patches-6.12/802-mfd-Add-RTL8231-core-device.patch b/target/linux/realtek/patches-6.12/802-mfd-Add-RTL8231-core-device.patch index df4d4aa1434..b5078ba8bc9 100644 --- a/target/linux/realtek/patches-6.12/802-mfd-Add-RTL8231-core-device.patch +++ b/target/linux/realtek/patches-6.12/802-mfd-Add-RTL8231-core-device.patch @@ -32,7 +32,7 @@ Signed-off-by: Sander Vanheule --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig -@@ -1171,6 +1171,15 @@ config MFD_RDC321X +@@ -1195,6 +1195,15 @@ config MFD_RDC321X southbridge which provides access to GPIOs and Watchdog using the southbridge PCI device configuration space. @@ -50,7 +50,7 @@ Signed-off-by: Sander Vanheule depends on I2C --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile -@@ -240,6 +240,7 @@ obj-$(CONFIG_MFD_HI6421_PMIC) += hi6421- +@@ -246,6 +246,7 @@ obj-$(CONFIG_MFD_HI6421_PMIC) += hi6421- obj-$(CONFIG_MFD_HI6421_SPMI) += hi6421-spmi-pmic.o obj-$(CONFIG_MFD_HI655X_PMIC) += hi655x-pmic.o obj-$(CONFIG_MFD_DLN2) += dln2.o