Wireless driver patching: fix inconsistency in matching (#8789)

* Wireless driver patching: fix inconsistency in matching

Mathing Allwinner family via LINUXFAMILY is giving different results. sunxi doesn't cover sun5* ...

* Re-adding wireless drivers that fall out of this bug + few additional
This commit is contained in:
Igor
2025-10-23 22:30:12 +02:00
committed by GitHub
parent 5cc80839fc
commit 8b0f9ad1ef
2 changed files with 55 additions and 6 deletions

View File

@@ -596,7 +596,6 @@ CONFIG_UEVENT_HELPER=y
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
CONFIG_MHI_BUS=m
CONFIG_MHI_BUS_EP=m
CONFIG_CONNECTOR=y
CONFIG_ARM_SCMI_PROTOCOL=m
@@ -837,6 +836,7 @@ CONFIG_USB_IPHETH=m
CONFIG_USB_SIERRA_NET=m
CONFIG_USB_VL600=m
CONFIG_USB_NET_CH9200=m
CONFIG_USB_NET_AQC111=m
CONFIG_ATH9K=m
CONFIG_ATH9K_HTC=m
CONFIG_ATH9K_HWRNG=y
@@ -845,6 +845,8 @@ CONFIG_CARL9170_HWRNG=y
CONFIG_AR5523=m
CONFIG_ATH10K=m
CONFIG_ATH10K_USB=m
CONFIG_ATH11K=m
CONFIG_ATH11K_PCI=m
CONFIG_ATH12K=m
# CONFIG_WLAN_VENDOR_ATMEL is not set
CONFIG_B43=m
@@ -857,10 +859,20 @@ CONFIG_BRCMFMAC=m
# CONFIG_WLAN_VENDOR_MARVELL is not set
CONFIG_MT7601U=m
CONFIG_MT76x0U=m
CONFIG_MT76x0E=m
CONFIG_MT76x2E=m
CONFIG_MT76x2U=m
CONFIG_MT7603E=m
CONFIG_MT7615E=m
CONFIG_MT7663U=m
CONFIG_MT7663S=m
CONFIG_MT7915E=m
CONFIG_MT7921E=m
CONFIG_MT7921S=m
CONFIG_MT7921U=m
CONFIG_MT7996E=m
CONFIG_MT7925E=m
CONFIG_MT7925U=m
CONFIG_PLFXLC=m
CONFIG_RT2X00=m
CONFIG_RT2500USB=m
@@ -870,30 +882,67 @@ CONFIG_RT2800USB_RT3573=y
CONFIG_RT2800USB_RT53XX=y
CONFIG_RT2800USB_RT55XX=y
CONFIG_RTL8187=m
CONFIG_RTL8192CE=m
CONFIG_RTL8192SE=m
CONFIG_RTL8192DE=m
CONFIG_RTL8723AE=m
CONFIG_RTL8723BE=m
CONFIG_RTL8188EE=m
CONFIG_RTL8192EE=m
CONFIG_RTL8821AE=m
CONFIG_RTL8192CU=m
CONFIG_RTL8192DU=m
# CONFIG_RTLWIFI_DEBUG is not set
CONFIG_RTL8XXXU=m
CONFIG_RTL8XXXU_UNTESTED=y
CONFIG_RTW88=m
CONFIG_RTW88_8822BS=m
CONFIG_RTW88_8822BU=m
CONFIG_RTW88_8822CE=m
CONFIG_RTW88_8822CS=m
CONFIG_RTW88_8822CU=m
CONFIG_RTW88_8723DE=m
CONFIG_RTW88_8723DS=m
CONFIG_RTW88_8723CS=m
CONFIG_RTW88_8723DU=m
CONFIG_RTW88_8821CE=m
CONFIG_RTW88_8821CS=m
CONFIG_RTW88_8821CU=m
CONFIG_RTW88_8821AU=m
CONFIG_RTW88_8812AU=m
CONFIG_RTW88_8814AE=m
CONFIG_RTW88_8814AU=m
CONFIG_RTW88_DEBUGFS=y
CONFIG_RTW89=m
CONFIG_RTW89_8851BE=m
CONFIG_RTW89_8852AE=m
CONFIG_RTW89_8852BE=m
CONFIG_RTW89_8852BTE=m
CONFIG_RTW89_8852CE=m
CONFIG_RTW89_8922AE=m
# CONFIG_WLAN_VENDOR_RSI is not set
CONFIG_WFX=m
# CONFIG_WLAN_VENDOR_ST is not set
# CONFIG_WLAN_VENDOR_TI is not set
CONFIG_RTL8723DS=m
CONFIG_RTL8822BU=m
CONFIG_RTL8821CU=m
CONFIG_XRADIO=m
CONFIG_88XXAU=m
CONFIG_RTL8192EU=m
CONFIG_RTL8189FS=m
CONFIG_RTL8189ES=m
# CONFIG_WLAN_VENDOR_ZYDAS is not set
CONFIG_SPARD_WLAN_SUPPORT=y
CONFIG_SC23XX=y
CONFIG_UMW2653=m
CONFIG_SC2342_INTEG=m
CONFIG_SC2355=m
CONFIG_SC2366=m
CONFIG_WCN_BSP_DRIVER_BUILDIN=y
CONFIG_WLAN_UWE5621=m
CONFIG_WLAN_UWE5622=m
CONFIG_UNISOC_WIFI_PS=y
CONFIG_VIRT_WIFI=m
CONFIG_WWAN=m
CONFIG_WWAN_HWSIM=m

View File

@@ -233,7 +233,7 @@ driver_xradio_xr819() {
# Wireless drivers for Xradio XR819 chipsets
if linux-version compare "${version}" ge 4.19 && [[ "$LINUXFAMILY" == sunxi* ]]; then
if linux-version compare "${version}" ge 4.19 && [[ "$LINUXFAMILY" == sun* ]]; then
# Attach to specific commit (is branch:master)
local xradio_xr819_ver="commit:684a91a3692a964c5886dcf4369874cc7c19c0a4" # Commit date: Aug 7, 2025 (please update when updating commit ref)
@@ -482,7 +482,7 @@ driver_uwe5622() {
# Wireless drivers for Unisoc uwe5622 wireless
if linux-version compare "${version}" ge 5.15 && [[ "$LINUXFAMILY" == sunxi* || "$LINUXFAMILY" == rockchip64 || "$LINUXFAMILY" == rk35xx ]]; then
if linux-version compare "${version}" ge 5.15 && [[ "$LINUXFAMILY" == sun* || "$LINUXFAMILY" == rockchip64 || "$LINUXFAMILY" == rk35xx ]]; then
display_alert "Adding" "Drivers for Unisoc uwe5622 found on some Allwinner and Rockchip boards" "info"
@@ -522,7 +522,7 @@ driver_uwe5622() {
process_patch_file "${SRC}/patch/misc/wireless-uwe5622/uwe5622-v6.6-fix-tty-sdio.patch" "applying"
fi
if [[ "$LINUXFAMILY" == sunxi* ]]; then
if [[ "$LINUXFAMILY" == sun* ]]; then
process_patch_file "${SRC}/patch/misc/wireless-uwe5622/uwe5622-fix-setting-mac-address-for-netdev.patch" "applying"
fi
@@ -552,7 +552,7 @@ driver_uwe5622() {
fi
if linux-version compare "${version}" ge 6.15; then
if [[ "$LINUXFAMILY" == sunxi* ]]; then
if [[ "$LINUXFAMILY" == sun* ]]; then
process_patch_file "${SRC}/patch/misc/wireless-uwe5622/uwe5622-fix-timer-api-changes-for-6.15-only-sunxi.patch" "applying"
else
process_patch_file "${SRC}/patch/misc/wireless-uwe5622/uwe5622-v6.15-timer-api-changes.patch" "applying"
@@ -573,7 +573,7 @@ driver_uwe5622() {
driver_rtl8723cs() {
# Wireless drivers for Realtek rtl8723cs chipsets
# Driver has been borrowed from sunxi 6.1 megous patch archive.
# Driver has been borrowed from sun* 6.1 megous patch archive.
# Applies only from linux 6.1 onwards, so older kernel archives does not require to be altered
# It was disabled from d1/bcm2711 as that kernel is not fully in sync with mainline and as its probably not needed there anyway