[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200625160725.31581-1-matthias.bgg@kernel.org>
Date: Thu, 25 Jun 2020 18:07:25 +0200
From: matthias.bgg@...nel.org
To: arend.vanspriel@...adcom.com, kvalo@...eaurora.org,
davem@...emloft.net, kuba@...nel.org
Cc: franky.lin@...adcom.com, hante.meuleman@...adcom.com,
chi-hsien.lin@...ress.com, wright.feng@...ress.com,
mbrugger@...e.com, linux-wireless@...r.kernel.org,
brcm80211-dev-list.pdl@...adcom.com,
brcm80211-dev-list@...ress.com, netdev@...r.kernel.org,
linux-kernel@...r.kernel.org, matthias.bgg@...nel.org,
hdegoede@...hat.com
Subject: [PATCH] brcmfmac: Transform compatible string for FW loading
From: Matthias Brugger <mbrugger@...e.com>
The driver relies on the compatible string from DT to determine which
FW configuration file it should load. The DTS spec allows for '/' as
part of the compatible string. We change this to '-' so that we will
still be able to load the config file, even when the compatible has a
'/'. This fixes explicitly the firmware loading for
"solidrun,cubox-i/q".
Signed-off-by: Matthias Brugger <mbrugger@...e.com>
---
.../wireless/broadcom/brcm80211/brcmfmac/of.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
index b886b56a5e5a..8a41b7f9cad3 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
@@ -17,7 +17,6 @@ void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,
{
struct brcmfmac_sdio_pd *sdio = &settings->bus.sdio;
struct device_node *root, *np = dev->of_node;
- struct property *prop;
int irq;
u32 irqf;
u32 val;
@@ -25,8 +24,21 @@ void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,
/* Set board-type to the first string of the machine compatible prop */
root = of_find_node_by_path("/");
if (root) {
- prop = of_find_property(root, "compatible", NULL);
- settings->board_type = of_prop_next_string(prop, NULL);
+ int i;
+ char *board_type;
+ const char *tmp;
+
+ of_property_read_string_index(root, "compatible", 0, &tmp);
+
+ /* get rid of '/' in the compatible string to be able to find the FW */
+ board_type = devm_kzalloc(dev, strlen(tmp), GFP_KERNEL);
+ strncpy(board_type, tmp, strlen(tmp));
+ for (i = 0; i < strlen(board_type); i++) {
+ if (board_type[i] == '/')
+ board_type[i] = '-';
+ }
+ settings->board_type = board_type;
+
of_node_put(root);
}
--
2.27.0
Powered by blists - more mailing lists