| Message ID | 20240816020635.1273911-2-jacobe.zang@wesion.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | Add AP6275P wireless support | expand |
Jacobe Zang <jacobe.zang@wesion.com> wrote: > It's the device id used by AP6275P which is the Wi-Fi module > used by Rockchip's RK3588 evaluation board and also used in > some other RK3588 boards. > > Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com> > Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > Signed-off-by: Jacobe Zang <jacobe.zang@wesion.com> Fails to apply, please rebase on top of wireless-next. Recorded preimage for 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c' Recorded preimage for 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c' error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Applying: wifi: brcmfmac: Add optional lpo clock enable support Using index info to reconstruct a base tree... M drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c M drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c M drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c M drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c M drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c CONFLICT (content): Merge conflict in drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c CONFLICT (content): Merge conflict in drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c Patch failed at 0001 wifi: brcmfmac: Add optional lpo clock enable support 4 patches set to Changes Requested. 13765357 [v11,1/4] dt-bindings: net: wireless: brcm4329-fmac: add pci14e4,449d 13765358 [v11,2/4] dt-bindings: net: wireless: brcm4329-fmac: add clock description for AP6275P 13765359 [v11,3/4] wifi: brcmfmac: Add optional lpo clock enable support 13765360 [v11,4/4] wifi: brcmfmac: add flag for random seed during firmware download
diff --git a/Documentation/devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml b/Documentation/devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml index e564f20d8f415..2c2093c77ec9a 100644 --- a/Documentation/devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml +++ b/Documentation/devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml @@ -53,6 +53,7 @@ properties: - pci14e4,4488 # BCM4377 - pci14e4,4425 # BCM4378 - pci14e4,4433 # BCM4387 + - pci14e4,449d # BCM43752 reg: description: SDIO function number for the device (for most cases