Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/linux-firmware.git#ac763aa19739d6c49432ec2b0cc65b97a066b611

0001-brcm-Fix-Raspberry-Pi-4B-NVRAM-file.patch

@@ -0,0 +1,31 @@
+From 58825f74eb0156822065c449a770644a69044d88 Mon Sep 17 00:00:00 2001
+From: Matthias Brugger <mbrugger@suse.com>
+Date: Tue, 16 Feb 2021 20:35:23 +0100
+Subject: [PATCH 1/6] brcm: Fix Raspberry Pi 4B NVRAM file
+
+NVRAM file set's boarflags3 to 0x48200100 which indicates the firmware
+that an external LPO is present. But on the RPi4 no external LPO exists.
+
+Fixes: 870b805 ("brcm: Update Raspberry Pi 3B+/4B NVRAM for downstream changes")
+Signed-off-by: Matthias Brugger <mbrugger@suse.com>
+Signed-off-by: Josh Boyer <jwboyer@kernel.org>
+---
+ brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt b/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt
+index d5bd530..8dda168 100644
+--- a/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt
++++ b/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt
+@@ -7,7 +7,7 @@ aa5g=1
+ AvVmid_c0=1,165,2,100,2,100,2,100,2,100
+ boardflags=0x00480201
+ boardflags2=0x40800000
+-boardflags3=0x48200100
++boardflags3=0x44200100
+ boardrev=0x1304
+ boardtype=0x6e4
+ btc_mode=1
+-- 
+2.29.2
+

linux-firmware.spec

@@ -1,5 +1,5 @@
 %global debug_package %{nil}
-%global firmware_release 117
+%global firmware_release 118
 
 %global _firmwarepath	/usr/lib/firmware
 %define _binaries_in_noarch_packages_terminate_build 0
@@ -14,6 +14,7 @@ BuildArch:	noarch
 
 Source0:	https://www.kernel.org/pub/linux/kernel/firmware/%{name}-%{version}.tar.xz
 Patch1:		0001-Add-support-for-compressing-firmware-in-copy-firmwar.patch
+Patch2:		0001-brcm-Fix-Raspberry-Pi-4B-NVRAM-file.patch
 
 BuildRequires:	make
 Requires:	linux-firmware-whence
@@ -437,6 +438,9 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files
 %{_firmwarepath}/netronome/*
 
 %changelog
+* Mon Mar 08 2021 Peter Robinson <pbrobinson@fedoraproject.org> 20210208-118
+- Fix for Raspberry Pi 4 WiFi
+
 * Mon Feb  8 2021 Peter Robinson <pbrobinson@fedoraproject.org> 20210208-117
 - rtl_bt: Updates for RTL8822C, RTL8821C, added RTL8852A
 - Link Cypress brcmfmac firmwares to old brcm location