[openwrt/openwrt] realtek: 6.12: refresh patches with slightly changed anchors

LEDE Commits lede-commits at lists.infradead.org
Wed Jun 11 13:27:36 PDT 2025 

robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/e9a093818c1604d4e1125d823ff78d29487539df

commit e9a093818c1604d4e1125d823ff78d29487539df
Author: Markus Stockhausen <markus.stockhausen at gmx.de>
AuthorDate: Tue May 27 14:17:05 2025 -0400

    realtek: 6.12: refresh patches with slightly changed anchors
    
    Patches where fuzz had to be cleaned up.
    
    Signed-off-by: Markus Stockhausen <markus.stockhausen at gmx.de>
    Link: https://github.com/openwrt/openwrt/pull/18935
    Signed-off-by: Robert Marko <robimarko at gmail.com>
---
 .../patches-6.12/330-add-realtek-thernal-driver.patch    |  5 +++--
 .../702-include-linux-add-phy-hsgmii-mode.patch          | 16 ++++++++--------
 ...inctrl-Add-RTL8231-pin-control-and-GPIO-support.patch | 10 +++++-----
 ...04-leds-Add-support-for-RTL8231-LED-scan-matrix.patch |  6 +++---
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/target/linux/realtek/patches-6.12/330-add-realtek-thernal-driver.patch b/target/linux/realtek/patches-6.12/330-add-realtek-thernal-driver.patch
index af550a8c20..055ee845d0 100644
--- a/target/linux/realtek/patches-6.12/330-add-realtek-thernal-driver.patch
+++ b/target/linux/realtek/patches-6.12/330-add-realtek-thernal-driver.patch
@@ -1,6 +1,6 @@
 --- a/drivers/thermal/Kconfig
 +++ b/drivers/thermal/Kconfig
-@@ -522,4 +522,11 @@ config LOONGSON2_THERMAL
+@@ -499,4 +499,11 @@ config LOONGSON2_THERMAL
  	  is higher than the high temperature threshold or lower than the low
  	  temperature threshold, the interrupt will occur.
  
@@ -14,8 +14,9 @@
  endif
 --- a/drivers/thermal/Makefile
 +++ b/drivers/thermal/Makefile
-@@ -64,3 +64,4 @@ obj-$(CONFIG_AMLOGIC_THERMAL)     += aml
+@@ -63,4 +63,5 @@ obj-$(CONFIG_AMLOGIC_THERMAL)     += aml
  obj-$(CONFIG_SPRD_THERMAL)	+= sprd_thermal.o
  obj-$(CONFIG_KHADAS_MCU_FAN_THERMAL)	+= khadas_mcu_fan.o
  obj-$(CONFIG_LOONGSON2_THERMAL)	+= loongson2_thermal.o
 +obj-$(CONFIG_REALTEK_THERMAL)	+= realtek-thermal.o
+ obj-$(CONFIG_THERMAL_CORE_TESTING)	+= testing/
diff --git a/target/linux/realtek/patches-6.12/702-include-linux-add-phy-hsgmii-mode.patch b/target/linux/realtek/patches-6.12/702-include-linux-add-phy-hsgmii-mode.patch
index a43b49c1ff..3e25979274 100644
--- a/target/linux/realtek/patches-6.12/702-include-linux-add-phy-hsgmii-mode.patch
+++ b/target/linux/realtek/patches-6.12/702-include-linux-add-phy-hsgmii-mode.patch
@@ -34,7 +34,7 @@ Submitted-by: Birger Koblitz <git at birger-koblitz.de>
  	PHY_INTERFACE_MODE_10GBASER,
  	PHY_INTERFACE_MODE_5GBASER,
  	PHY_INTERFACE_MODE_2500BASEX,
-@@ -238,6 +239,7 @@ static int phylink_interface_max_speed(p
+@@ -239,6 +240,7 @@ static int phylink_interface_max_speed(p
  
  	case PHY_INTERFACE_MODE_XGMII:
  	case PHY_INTERFACE_MODE_RXAUI:
@@ -42,7 +42,7 @@ Submitted-by: Birger Koblitz <git at birger-koblitz.de>
  	case PHY_INTERFACE_MODE_XAUI:
  	case PHY_INTERFACE_MODE_10GBASER:
  	case PHY_INTERFACE_MODE_10GKR:
-@@ -547,6 +549,7 @@ unsigned long phylink_get_capabilities(p
+@@ -552,6 +554,7 @@ static unsigned long phylink_get_capabil
  		break;
  
  	case PHY_INTERFACE_MODE_XGMII:
@@ -50,17 +50,17 @@ Submitted-by: Birger Koblitz <git at birger-koblitz.de>
  	case PHY_INTERFACE_MODE_RXAUI:
  	case PHY_INTERFACE_MODE_XAUI:
  	case PHY_INTERFACE_MODE_10GBASER:
-@@ -957,6 +960,7 @@ static int phylink_parse_mode(struct phy
- 			fallthrough;
+@@ -933,6 +936,7 @@ static int phylink_parse_mode(struct phy
  		case PHY_INTERFACE_MODE_USXGMII:
+ 		case PHY_INTERFACE_MODE_10G_QXGMII:
  		case PHY_INTERFACE_MODE_10GKR:
 +		case PHY_INTERFACE_MODE_HSGMII:
  		case PHY_INTERFACE_MODE_10GBASER:
- 			phylink_set(pl->supported, 10baseT_Half);
- 			phylink_set(pl->supported, 10baseT_Full);
+ 		case PHY_INTERFACE_MODE_XLGMII:
+ 			caps = ~(MAC_SYM_PAUSE | MAC_ASYM_PAUSE);
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
-@@ -148,6 +148,7 @@ typedef enum {
+@@ -152,6 +152,7 @@ typedef enum {
  	PHY_INTERFACE_MODE_XGMII,
  	PHY_INTERFACE_MODE_XLGMII,
  	PHY_INTERFACE_MODE_MOCA,
@@ -68,7 +68,7 @@ Submitted-by: Birger Koblitz <git at birger-koblitz.de>
  	PHY_INTERFACE_MODE_PSGMII,
  	PHY_INTERFACE_MODE_QSGMII,
  	PHY_INTERFACE_MODE_TRGMII,
-@@ -256,6 +257,8 @@ static inline const char *phy_modes(phy_
+@@ -261,6 +262,8 @@ static inline const char *phy_modes(phy_
  		return "xlgmii";
  	case PHY_INTERFACE_MODE_MOCA:
  		return "moca";
diff --git a/target/linux/realtek/patches-6.12/803-pinctrl-Add-RTL8231-pin-control-and-GPIO-support.patch b/target/linux/realtek/patches-6.12/803-pinctrl-Add-RTL8231-pin-control-and-GPIO-support.patch
index de0f5ee868..1b88dcd55c 100644
--- a/target/linux/realtek/patches-6.12/803-pinctrl-Add-RTL8231-pin-control-and-GPIO-support.patch
+++ b/target/linux/realtek/patches-6.12/803-pinctrl-Add-RTL8231-pin-control-and-GPIO-support.patch
@@ -23,9 +23,9 @@ Signed-off-by: Sander Vanheule <sander at svanheule.net>
 
 --- a/drivers/pinctrl/Kconfig
 +++ b/drivers/pinctrl/Kconfig
-@@ -417,6 +417,17 @@ config PINCTRL_ROCKCHIP
- 	help
-           This support pinctrl and GPIO driver for Rockchip SoCs.
+@@ -483,6 +483,17 @@ config PINCTRL_SCMI
+ 	  It uses SCMI Message Protocol to interact with the
+ 	  firmware providing all the pinctrl controls.
  
 +config PINCTRL_RTL8231
 +	tristate "Realtek RTL8231 GPIO expander's pin controller"
@@ -43,14 +43,14 @@ Signed-off-by: Sander Vanheule <sander at svanheule.net>
  	depends on OF
 --- a/drivers/pinctrl/Makefile
 +++ b/drivers/pinctrl/Makefile
-@@ -43,6 +43,7 @@ obj-$(CONFIG_PINCTRL_PIC32)	+= pinctrl-p
+@@ -47,6 +47,7 @@ obj-$(CONFIG_PINCTRL_PIC32)	+= pinctrl-p
  obj-$(CONFIG_PINCTRL_PISTACHIO)	+= pinctrl-pistachio.o
  obj-$(CONFIG_PINCTRL_RK805)	+= pinctrl-rk805.o
  obj-$(CONFIG_PINCTRL_ROCKCHIP)	+= pinctrl-rockchip.o
 +obj-$(CONFIG_PINCTRL_RTL8231)	+= pinctrl-rtl8231.o
+ obj-$(CONFIG_PINCTRL_SCMI)	+= pinctrl-scmi.o
  obj-$(CONFIG_PINCTRL_SINGLE)	+= pinctrl-single.o
  obj-$(CONFIG_PINCTRL_ST) 	+= pinctrl-st.o
- obj-$(CONFIG_PINCTRL_STMFX) 	+= pinctrl-stmfx.o
 --- /dev/null
 +++ b/drivers/pinctrl/pinctrl-rtl8231.c
 @@ -0,0 +1,525 @@
diff --git a/target/linux/realtek/patches-6.12/804-leds-Add-support-for-RTL8231-LED-scan-matrix.patch b/target/linux/realtek/patches-6.12/804-leds-Add-support-for-RTL8231-LED-scan-matrix.patch
index 37542b8230..6187d095c8 100644
--- a/target/linux/realtek/patches-6.12/804-leds-Add-support-for-RTL8231-LED-scan-matrix.patch
+++ b/target/linux/realtek/patches-6.12/804-leds-Add-support-for-RTL8231-LED-scan-matrix.patch
@@ -21,7 +21,7 @@ Signed-off-by: Sander Vanheule <sander at svanheule.net>
 
 --- a/drivers/leds/Kconfig
 +++ b/drivers/leds/Kconfig
-@@ -586,6 +586,16 @@ config LEDS_REGULATOR
+@@ -634,6 +634,16 @@ config LEDS_REGULATOR
  	help
  	  This option enables support for regulator driven LEDs.
  
@@ -40,14 +40,14 @@ Signed-off-by: Sander Vanheule <sander at svanheule.net>
  	depends on LEDS_CLASS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
-@@ -77,6 +77,7 @@ obj-$(CONFIG_LEDS_PM8058)		+= leds-pm805
+@@ -80,6 +80,7 @@ obj-$(CONFIG_LEDS_PM8058)		+= leds-pm805
  obj-$(CONFIG_LEDS_POWERNV)		+= leds-powernv.o
  obj-$(CONFIG_LEDS_PWM)			+= leds-pwm.o
  obj-$(CONFIG_LEDS_REGULATOR)		+= leds-regulator.o
 +obj-$(CONFIG_LEDS_RTL8231)		+= leds-rtl8231.o
  obj-$(CONFIG_LEDS_SC27XX_BLTC)		+= leds-sc27xx-bltc.o
+ obj-$(CONFIG_LEDS_SUN50I_A100)		+= leds-sun50i-a100.o
  obj-$(CONFIG_LEDS_ST1202)		+= leds-st1202.o
- obj-$(CONFIG_LEDS_SUNFIRE)		+= leds-sunfire.o
 --- /dev/null
 +++ b/drivers/leds/leds-rtl8231.c
 @@ -0,0 +1,285 @@

More information about the lede-commits mailing list