[PATCH] brcm: Link CM4's WiFi firmware with DMI machine name.

[PATCH] brcm: Link CM4's WiFi firmware with DMI machine name.

[jlinton]

From: Jeremy Linton <jeremy.linton@arm.com>

The kernel when booted in ACPI mode with SMBIOS/DMI
data uses the DMI data to set the machine
manufacture/model.

The WiFi driver uses the machine string to select the
correct firmware image. Because of this, an additional
link to select the correct firmware is needed.

Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Peter Robinson <pbrobinson@gmail.com>
Cc: Josh Boyer <jwboyer@kernel.org>
Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
---
 WHENCE | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WHENCE b/WHENCE
index aa96404..1eaee0b 100644
--- a/WHENCE
+++ b/WHENCE
@@ -2723,6 +2723,7 @@ File: "brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt"
 Link: brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt -> brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
 File: "brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt"
 Link: brcm/brcmfmac43455-sdio.Raspberry\ Pi\ Foundation-Raspberry\ Pi\ 4\ Model\ B.txt -> brcmfmac43455-sdio.raspberrypi,4-model-b.txt
+Link: brcm/brcmfmac43455-sdio.Raspberry\ Pi\ Foundation-Raspberry\ Pi\ Compute\ Module\ 4.txt -> brcmfmac43455-sdio.raspberrypi,4-model-b.txt
 File: "brcm/brcmfmac43455-sdio.MINIX-NEO Z83-4.txt"
 File: "brcm/brcmfmac4356-pcie.gpd-win-pocket.txt"
 File: brcm/brcmfmac4356-sdio.vamrs,rock960.txt
-- 
2.29.2

Re: [PATCH] brcm: Link CM4's WiFi firmware with DMI machine name.

[Hans de Goede]

Hi,

On 4/8/21 5:25 AM, jlinton wrote:
> From: Jeremy Linton <jeremy.linton@arm.com>
> 
> The kernel when booted in ACPI mode with SMBIOS/DMI
> data uses the DMI data to set the machine
> manufacture/model.
> 
> The WiFi driver uses the machine string to select the
> correct firmware image. Because of this, an additional
> link to select the correct firmware is needed.
> 
> Cc: Hans de Goede <hdegoede@redhat.com>
> Cc: Peter Robinson <pbrobinson@gmail.com>
> Cc: Josh Boyer <jwboyer@kernel.org>
> Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>

Thanks, patch looks good to me:

Reviewed-by: Hans de Goede <hdegoede@redhat.com>

Regards,

Hans



> ---
>  WHENCE | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/WHENCE b/WHENCE
> index aa96404..1eaee0b 100644
> --- a/WHENCE
> +++ b/WHENCE
> @@ -2723,6 +2723,7 @@ File: "brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt"
>  Link: brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt -> brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
>  File: "brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt"
>  Link: brcm/brcmfmac43455-sdio.Raspberry\ Pi\ Foundation-Raspberry\ Pi\ 4\ Model\ B.txt -> brcmfmac43455-sdio.raspberrypi,4-model-b.txt
> +Link: brcm/brcmfmac43455-sdio.Raspberry\ Pi\ Foundation-Raspberry\ Pi\ Compute\ Module\ 4.txt -> brcmfmac43455-sdio.raspberrypi,4-model-b.txt
>  File: "brcm/brcmfmac43455-sdio.MINIX-NEO Z83-4.txt"
>  File: "brcm/brcmfmac4356-pcie.gpd-win-pocket.txt"
>  File: brcm/brcmfmac4356-sdio.vamrs,rock960.txt
> 

Re: [PATCH] brcm: Link CM4's WiFi firmware with DMI machine name.

[Josh Boyer]

Applied and pushed out.

josh

On Thu, Apr 8, 2021 at 5:15 AM Hans de Goede <hdegoede@redhat.com> wrote:
>
> Hi,
>
> On 4/8/21 5:25 AM, jlinton wrote:
> > From: Jeremy Linton <jeremy.linton@arm.com>
> >
> > The kernel when booted in ACPI mode with SMBIOS/DMI
> > data uses the DMI data to set the machine
> > manufacture/model.
> >
> > The WiFi driver uses the machine string to select the
> > correct firmware image. Because of this, an additional
> > link to select the correct firmware is needed.
> >
> > Cc: Hans de Goede <hdegoede@redhat.com>
> > Cc: Peter Robinson <pbrobinson@gmail.com>
> > Cc: Josh Boyer <jwboyer@kernel.org>
> > Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
>
> Thanks, patch looks good to me:
>
> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
>
> Regards,
>
> Hans
>
>
>
> > ---
> >  WHENCE | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/WHENCE b/WHENCE
> > index aa96404..1eaee0b 100644
> > --- a/WHENCE
> > +++ b/WHENCE
> > @@ -2723,6 +2723,7 @@ File: "brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt"
> >  Link: brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt -> brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
> >  File: "brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt"
> >  Link: brcm/brcmfmac43455-sdio.Raspberry\ Pi\ Foundation-Raspberry\ Pi\ 4\ Model\ B.txt -> brcmfmac43455-sdio.raspberrypi,4-model-b.txt
> > +Link: brcm/brcmfmac43455-sdio.Raspberry\ Pi\ Foundation-Raspberry\ Pi\ Compute\ Module\ 4.txt -> brcmfmac43455-sdio.raspberrypi,4-model-b.txt
> >  File: "brcm/brcmfmac43455-sdio.MINIX-NEO Z83-4.txt"
> >  File: "brcm/brcmfmac4356-pcie.gpd-win-pocket.txt"
> >  File: brcm/brcmfmac4356-sdio.vamrs,rock960.txt
> >
>