298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

mac80211: fix brcm patch 5.15 support

Browse Source
This commit is contained in:
coolsnowwolf 2022-08-13 08:58:04 +00:00
parent 21b5bb211e
commit ae6810abe1
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package/kernel/mac80211/patches/brcm/999-backport-to-linux-5.18.patch
View File

@ -82,12 +82,15 @@ diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/n
index 8effeb7..04362e2 100644 index 8effeb7..04362e2 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
@@ -4165,7 +4165,7 @@ static int brcmf_sdio_bus_reset(struct device *dev) @@ -4164,7 +4164,11 @@
/* reset the adapter */ /* reset the adapter */
sdio_claim_host(sdiodev->func1); sdio_claim_host(sdiodev->func1);
- mmc_hw_reset(sdiodev->func1->card->host); +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
mmc_hw_reset(sdiodev->func1->card->host);
+#else
+ mmc_hw_reset(sdiodev->func1->card); + mmc_hw_reset(sdiodev->func1->card);
+#endif
sdio_release_host(sdiodev->func1); sdio_release_host(sdiodev->func1);
brcmf_bus_change_state(sdiodev->bus_if, BRCMF_BUS_DOWN); brcmf_bus_change_state(sdiodev->bus_if, BRCMF_BUS_DOWN);

20
target/linux/rockchip/image/armv8.mk
View File

@ -32,6 +32,16 @@ define Device/fastrhino_r66s
endef endef
TARGET_DEVICES += fastrhino_r66s TARGET_DEVICES += fastrhino_r66s
define Device/firefly_station-p2
DEVICE_VENDOR := Firefly
DEVICE_MODEL := Station P2
SOC := rk3568
UBOOT_DEVICE_NAME := station-p2-rk3568
IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r5s | pine64-img | gzip | append-metadata
DEVICE_PACKAGES := kmod-brcmfmac kmod-ikconfig ata-ahci-platform station-p2-firmware wpad
endef
TARGET_DEVICES += firefly_station-p2
define Device/friendlyarm_nanopi-neo3 define Device/friendlyarm_nanopi-neo3
DEVICE_VENDOR := FriendlyARM DEVICE_VENDOR := FriendlyARM
DEVICE_MODEL := NanoPi NEO3 DEVICE_MODEL := NanoPi NEO3
@ -131,13 +141,3 @@ define Device/xunlong_orangepi-r1-plus-lts
DEVICE_PACKAGES := kmod-usb-net-rtl8152 DEVICE_PACKAGES := kmod-usb-net-rtl8152
endef endef
TARGET_DEVICES += xunlong_orangepi-r1-plus-lts TARGET_DEVICES += xunlong_orangepi-r1-plus-lts
define Device/firefly_station-p2
DEVICE_VENDOR := Firefly
DEVICE_MODEL := Station P2
SOC := rk3568
UBOOT_DEVICE_NAME := station-p2-rk3568
IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r5s | pine64-img | gzip | append-metadata
DEVICE_PACKAGES := kmod-brcmfmac kmod-ikconfig ata-ahci-platform station-p2-firmware wpad
endef
TARGET_DEVICES += firefly_station-p2