brcmfmac: Prefer DT board type over DMI board type
authorIvan T. Ivanov <iivanov@suse.de>
Fri, 6 Jan 2023 13:19:05 +0000 (15:19 +0200)
committerDavid S. Miller <davem@davemloft.net>
Mon, 9 Jan 2023 07:24:54 +0000 (07:24 +0000)
commita5a36720c3f650f859f5e9535dd62d06f13f4f3b
tree056c5c485e28791278add0522538d250625a4317
parent571f3dd0d01b62ec63a4039320dbdbcd54ae8fb0
brcmfmac: Prefer DT board type over DMI board type

The introduction of support for Apple board types inadvertently changed
the precedence order, causing hybrid SMBIOS+DT platforms to look up the
firmware using the DMI information instead of the device tree compatible
to generate the board type. Revert back to the old behavior,
as affected platforms use firmwares named after the DT compatible.

Fixes: 7682de8b3351 ("wifi: brcmfmac: of: Fetch Apple properties")
[1] https://bugzilla.opensuse.org/show_bug.cgi?id=1206697#c13

Cc: stable@vger.kernel.org
Signed-off-by: Ivan T. Ivanov <iivanov@suse.de>
Reviewed-by: Hector Martin <marcan@marcan.st>
Reviewed-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Tested-by: Peter Robinson <pbrobinson@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c