You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
40 lines
1.6 KiB
Diff
40 lines
1.6 KiB
Diff
From 554da3868eb1d7174710c18b4ddd6ff01f6d612c Mon Sep 17 00:00:00 2001
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
Date: Fri, 23 Nov 2018 10:11:48 +0100
|
|
Subject: [PATCH] brcmfmac: Call brcmf_dmi_probe before brcmf_of_probe
|
|
|
|
ARM systems with UEFI may have both devicetree (of) and DMI data in this
|
|
case we end up setting brcmf_mp_device.board_type twice.
|
|
|
|
In this case we should prefer the devicetree data, because:
|
|
1) The devicerree data is more reliable
|
|
2) Some ARM systems (e.g. the Raspberry Pi 3 models) support both UEFI and
|
|
classic uboot booting, the devicetree data is always there, so using it
|
|
makes sure we ask for the same nvram file independent of how we booted.
|
|
|
|
This commit moves the brcmf_dmi_probe call to before the brcmf_of_probe
|
|
call, so that the latter can override the value of the first if both are
|
|
set.
|
|
|
|
Fixes: bd1e82bb420a ("brcmfmac: Set board_type from DMI on x86 based ...")
|
|
Cc: Peter Robinson <pbrobinson@gmail.com>
|
|
Tested-and-reported-by: Peter Robinson <pbrobinson@gmail.com>
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
---
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
|
|
@@ -449,8 +449,8 @@ struct brcmf_mp_device *brcmf_get_module
|
|
}
|
|
if (!found) {
|
|
/* No platform data for this device, try OF and DMI data */
|
|
- brcmf_of_probe(dev, bus_type, settings);
|
|
brcmf_dmi_probe(settings, chip, chiprev);
|
|
+ brcmf_of_probe(dev, bus_type, settings);
|
|
}
|
|
return settings;
|
|
}
|