diff mbox series

[1/1] package/linux-firmware: add rpi settings files

Message ID 20201017151848.1283394-1-fhunleth@troodon-software.com
State Accepted
Headers show
Series [1/1] package/linux-firmware: add rpi settings files | expand

Commit Message

Frank Hunleth Oct. 17, 2020, 3:18 p.m. UTC
The brcmfmac drivers now load settings files for BCM434xx devices and
fail if they're missing on the Raspberry Pi:

brcmfmac mmc1:0001:1: Direct firmware load for brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt failed with error -2

This commit copies the missing settings files over to the firmware
directory with the other files.

Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com>
---
 package/linux-firmware/linux-firmware.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Yann E. MORIN Oct. 17, 2020, 4:20 p.m. UTC | #1
Frank, All,

On 2020-10-17 11:18 -0400, Frank Hunleth spake thusly:
> The brcmfmac drivers now load settings files for BCM434xx devices and
> fail if they're missing on the Raspberry Pi:
> 
> brcmfmac mmc1:0001:1: Direct firmware load for brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt failed with error -2
> 
> This commit copies the missing settings files over to the firmware
> directory with the other files.
> 
> Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/linux-firmware/linux-firmware.mk | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
> index 8a44129102..e2a6ebcbf1 100644
> --- a/package/linux-firmware/linux-firmware.mk
> +++ b/package/linux-firmware/linux-firmware.mk
> @@ -547,7 +547,10 @@ LINUX_FIRMWARE_FILES += \
>  	brcm/brcmfmac43362-sdio.bin brcm/brcmfmac43430-sdio.bin \
>  	brcm/brcmfmac43430a0-sdio.bin brcm/brcmfmac43455-sdio.bin \
>  	brcm/brcmfmac43569.bin brcm/brcmfmac43570-pcie.bin \
> -	brcm/brcmfmac43602-pcie.ap.bin brcm/brcmfmac43602-pcie.bin
> +	brcm/brcmfmac43602-pcie.ap.bin brcm/brcmfmac43602-pcie.bin \
> +	brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt \
> +	brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt \
> +	brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt
>  LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.broadcom_bcm43xx
>  endif
>  
> -- 
> 2.25.1
>
Peter Korsgaard Oct. 29, 2020, 2:35 p.m. UTC | #2
>>>>> "Frank" == Frank Hunleth <fhunleth@troodon-software.com> writes:

 > The brcmfmac drivers now load settings files for BCM434xx devices and
 > fail if they're missing on the Raspberry Pi:

 > brcmfmac mmc1:0001:1: Direct firmware load for brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt failed with error -2

 > This commit copies the missing settings files over to the firmware
 > directory with the other files.

 > Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com>

Committed to 2020.02.x (except for the RPI4 file which isn't present)
and 2020.08.x, thanks.
diff mbox series

Patch

diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
index 8a44129102..e2a6ebcbf1 100644
--- a/package/linux-firmware/linux-firmware.mk
+++ b/package/linux-firmware/linux-firmware.mk
@@ -547,7 +547,10 @@  LINUX_FIRMWARE_FILES += \
 	brcm/brcmfmac43362-sdio.bin brcm/brcmfmac43430-sdio.bin \
 	brcm/brcmfmac43430a0-sdio.bin brcm/brcmfmac43455-sdio.bin \
 	brcm/brcmfmac43569.bin brcm/brcmfmac43570-pcie.bin \
-	brcm/brcmfmac43602-pcie.ap.bin brcm/brcmfmac43602-pcie.bin
+	brcm/brcmfmac43602-pcie.ap.bin brcm/brcmfmac43602-pcie.bin \
+	brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt \
+	brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt \
+	brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.broadcom_bcm43xx
 endif