Skip to contentSkip to conversation

brcmfmac: use separate firmware for 43430 revision 2

PATCH Superseded Mikhail Rudenko 3 participants 13 messages May 9, 2021 – Aug 21, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 brcmfmac: use separate firmware for 43430 revision 2

A separate firmware is needed for Broadcom 43430 revision 2. This chip can be found in e.g. certain revisions of Ampak AP6212 wireless IC. Original firmware file from IC vendor is named 'fw_bcm43436b0.bin', but brcmfmac and also btbcm drivers report chip id 43430, so requested firmware file name is 'brcmfmac43430b0-sdio.bin' in line with other 43430 revisions.

---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +3 -1
index 16ed325795a8..f0c22b5bb57c 100644
@@ -617,6 +617,7 @@ BRCMF_FW_DEF(4339, "brcmfmac4339-sdio");
 BRCMF_FW_DEF(43430A0, "brcmfmac43430a0-sdio");
 /* Note the names are not postfixed with a1 for backward compatibility */
 BRCMF_FW_DEF(43430A1, "brcmfmac43430-sdio");
+BRCMF_FW_DEF(43430B0, "brcmfmac43430b0-sdio");
 BRCMF_FW_DEF(43455, "brcmfmac43455-sdio");
 BRCMF_FW_DEF(43456, "brcmfmac43456-sdio");
 BRCMF_FW_DEF(4354, "brcmfmac4354-sdio");
@@ -643,7 +644,8 @@ static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
 	BRCMF_FW_ENTRY(BRCM_CC_43362_CHIP_ID, 0xFFFFFFFE, 43362),
 	BRCMF_FW_ENTRY(BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, 4339),
 	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000001, 43430A0),
-	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFE, 43430A1),
+	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000002, 43430A1),
+	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000004, 43430B0),
 	BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0x00000200, 43456),
 	BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFDC0, 43455),
 	BRCMF_FW_ENTRY(BRCM_CC_4354_CHIP_ID, 0xFFFFFFFF, 4354),
Signature · 1 line
2.31.1
maintainer
#1 lore raw
Quoted 4 lines · Mikhail Rudenko

A separate firmware is needed for Broadcom 43430 revision 2. This chip can be found in e.g. certain revisions of Ampak AP6212 wireless IC. Original firmware file from IC vendor is named 'fw_bcm43436b0.bin', but brcmfmac and also btbcm drivers report chip

That is bad naming. There already is a 43436 USB device.

Quoted 2 lines

id 43430, so requested firmware file name is 'brcmfmac43430b0-sdio.bin' in line with other 43430 revisions.

As always there is the question about who will be publishing this particular firmware file to linux-firmware.

Regards,
Arend

#2 lore raw
Quoted 6 lines · Arend van Spriel
Quoted 4 lines · Mikhail Rudenko

A separate firmware is needed for Broadcom 43430 revision 2. This chip can be found in e.g. certain revisions of Ampak AP6212 wireless IC. Original firmware file from IC vendor is named 'fw_bcm43436b0.bin', but brcmfmac and also btbcm drivers report chip

Quoted 7 lines

That is bad naming. There already is a 43436 USB device.

Quoted 2 lines

id 43430, so requested firmware file name is 'brcmfmac43430b0-sdio.bin' in line with other 43430 revisions.

As always there is the question about who will be publishing this particular firmware file to linux-firmware.

The above mentioned file can be easily found by web search. Also, the corresponding patch for the bluetooth part has just been accepted [1]. Is it strictly necessary to have firmware file in linux-firmware in order to have this patch accepted?

--
Regards,
Mikhail

[1] https://lore.kernel.org/linux-bluetooth/[email protected]/

#3 lore raw
Quoted 12 lines · Mikhail Rudenko
Quoted 11 lines · Arend van Spriel
Quoted 4 lines · Mikhail Rudenko

A separate firmware is needed for Broadcom 43430 revision 2. This chip can be found in e.g. certain revisions of Ampak AP6212 wireless IC. Original firmware file from IC vendor is named 'fw_bcm43436b0.bin', but brcmfmac and also btbcm drivers report chip

That is bad naming. There already is a 43436 USB device.

Quoted 2 lines

id 43430, so requested firmware file name is 'brcmfmac43430b0-sdio.bin' in line with other 43430 revisions.

Quoted 7 lines
Quoted 2 lines

As always there is the question about who will be publishing this particular firmware file to linux-firmware.

The above mentioned file can be easily found by web search. Also, the corresponding patch for the bluetooth part has just been accepted [1]. Is it strictly necessary to have firmware file in linux-firmware in order to have this patch accepted?

Ping. Is this definitely no-go?

--
Regards,
Mikhail

#4 lore raw
In reply to Mikhail Rudenko
Quoted 12 lines · Mikhail Rudenko
Quoted 11 lines · Arend van Spriel
Quoted 4 lines · Mikhail Rudenko

A separate firmware is needed for Broadcom 43430 revision 2. This chip can be found in e.g. certain revisions of Ampak AP6212 wireless IC. Original firmware file from IC vendor is named 'fw_bcm43436b0.bin', but brcmfmac and also btbcm drivers report chip

That is bad naming. There already is a 43436 USB device.

Quoted 2 lines

id 43430, so requested firmware file name is 'brcmfmac43430b0-sdio.bin' in line with other 43430 revisions.

Quoted 7 lines
Quoted 2 lines

As always there is the question about who will be publishing this particular firmware file to linux-firmware.

The above mentioned file can be easily found by web search. Also, the corresponding patch for the bluetooth part has just been accepted [1]. Is it strictly necessary to have firmware file in linux-firmware in order to have this patch accepted?

This patch is a bit in the gray area. We have a rule that firmware images should be in linux-firmware, but as the vendor won't submit one and I assume the license doesn't approve the community submit it either, there is not really any solution for the firmware problem.

On the other hand some community members have access to the firmware somehow so this patch is useful to the community, and I think taking an exception to the rule in this case is justified. So I am inclined towards applying the patch.

Thoughts? I also have another similar patch in the queue:

https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
maintainer
#5 lore raw
Quoted 22 lines · Kalle Valo
Quoted 12 lines · Mikhail Rudenko
Quoted 11 lines · Arend van Spriel
Quoted 4 lines · Mikhail Rudenko

A separate firmware is needed for Broadcom 43430 revision 2. This chip can be found in e.g. certain revisions of Ampak AP6212 wireless IC. Original firmware file from IC vendor is named 'fw_bcm43436b0.bin', but brcmfmac and also btbcm drivers report chip

That is bad naming. There already is a 43436 USB device.

Quoted 2 lines

id 43430, so requested firmware file name is 'brcmfmac43430b0-sdio.bin' in line with other 43430 revisions.

Quoted 7 lines
Quoted 2 lines

As always there is the question about who will be publishing this particular firmware file to linux-firmware.

The above mentioned file can be easily found by web search. Also, the corresponding patch for the bluetooth part has just been accepted [1]. Is it strictly necessary to have firmware file in linux-firmware in order to have this patch accepted?

Quoted 4 lines

This patch is a bit in the gray area. We have a rule that firmware images should be in linux-firmware, but as the vendor won't submit one and I assume the license doesn't approve the community submit it either, there is not really any solution for the firmware problem.

At the moment I am not sure which company/division is shipping the 43430 rev 2 or 43436. Having it in linux-firmware is still preferred.

Quoted 4 lines

On the other hand some community members have access to the firmware somehow so this patch is useful to the community, and I think taking an exception to the rule in this case is justified. So I am inclined towards applying the patch.

As an end-user community members using the device are allowed to use the firmware to run on that device. So I tend to agree with you.

Quoted 3 lines

Thoughts? I also have another similar patch in the queue:

https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

I will review both and comment/ack them.

Regards,
Arend

maintainer Reviewed-by on v1 1/1
#6 lore raw
In reply to Mikhail Rudenko
Quoted 6 lines · Mikhail Rudenko

A separate firmware is needed for Broadcom 43430 revision 2. This chip can be found in e.g. certain revisions of Ampak AP6212 wireless IC. Original firmware file from IC vendor is named 'fw_bcm43436b0.bin', but brcmfmac and also btbcm drivers report chip id 43430, so requested firmware file name is 'brcmfmac43430b0-sdio.bin' in line with other 43430 revisions.

Quoted 18 lines
---
  drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +1 -0
index 16ed325795a8..f0c22b5bb57c 100644
@@ -617,6 +617,7 @@ BRCMF_FW_DEF(4339, "brcmfmac4339-sdio");
  BRCMF_FW_DEF(43430A0, "brcmfmac43430a0-sdio");
  /* Note the names are not postfixed with a1 for backward compatibility */
  BRCMF_FW_DEF(43430A1, "brcmfmac43430-sdio");
+BRCMF_FW_DEF(43430B0, "brcmfmac43430b0-sdio");
  BRCMF_FW_DEF(43455, "brcmfmac43455-sdio");
  BRCMF_FW_DEF(43456, "brcmfmac43456-sdio");
  BRCMF_FW_DEF(4354, "brcmfmac4354-sdio");

drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = { · line 648

Quoted 6 lines
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +2 -1
@@ -643,7 +644,8 @@ static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
  	BRCMF_FW_ENTRY(BRCM_CC_43362_CHIP_ID, 0xFFFFFFFE, 43362),
  	BRCMF_FW_ENTRY(BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, 4339),
  	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000001, 43430A0),
-	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFE, 43430A1),
+	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000002, 43430A1),
+	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000004, 43430B0),

Please follow the existing strategy, ie. support higher chip revisions unless proven otherwise. So 0xFFFFFFFC iso 0x00000004.

Quoted 4 lines
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +0 -0
  	BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0x00000200, 43456),
  	BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFDC0, 43455),
  	BRCMF_FW_ENTRY(BRCM_CC_4354_CHIP_ID, 0xFFFFFFFF, 4354),
#7 lore raw
Quoted 28 lines · Arend van Spriel
Quoted 6 lines · Mikhail Rudenko

A separate firmware is needed for Broadcom 43430 revision 2. This chip can be found in e.g. certain revisions of Ampak AP6212 wireless IC. Original firmware file from IC vendor is named 'fw_bcm43436b0.bin', but brcmfmac and also btbcm drivers report chip id 43430, so requested firmware file name is 'brcmfmac43430b0-sdio.bin' in line with other 43430 revisions.

Quoted 19 lines
---
  drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +1 -0
index 16ed325795a8..f0c22b5bb57c 100644
@@ -617,6 +617,7 @@ BRCMF_FW_DEF(4339, "brcmfmac4339-sdio");
  BRCMF_FW_DEF(43430A0, "brcmfmac43430a0-sdio");
  /* Note the names are not postfixed with a1 for backward compatibility */
  BRCMF_FW_DEF(43430A1, "brcmfmac43430-sdio");
+BRCMF_FW_DEF(43430B0, "brcmfmac43430b0-sdio");
  BRCMF_FW_DEF(43455, "brcmfmac43455-sdio");
  BRCMF_FW_DEF(43456, "brcmfmac43456-sdio");
  BRCMF_FW_DEF(4354, "brcmfmac4354-sdio");
@@ -643,7 +644,8 @@ static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
  	BRCMF_FW_ENTRY(BRCM_CC_43362_CHIP_ID, 0xFFFFFFFE, 43362),
Quoted 8 lines

drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = { · line 648

Quoted 5 lines
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +2 -1
  	BRCMF_FW_ENTRY(BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, 4339),
  	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000001, 43430A0),
-	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFE, 43430A1),
+	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000002, 43430A1),
+	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000004, 43430B0),

Please follow the existing strategy, ie. support higher chip revisions unless proven otherwise. So 0xFFFFFFFC iso 0x00000004.

Will fix in v2, thanks.

Quoted 4 lines

drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = { · line 651

Quoted 4 lines
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +0 -0
  	BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0x00000200, 43456),
  	BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFDC0, 43455),
  	BRCMF_FW_ENTRY(BRCM_CC_4354_CHIP_ID, 0xFFFFFFFF, 4354),

--
Regards,
Mikhail

#8 lore raw

PATCH v2 1/1 brcmfmac: use separate firmware for 43430 revision 2

In reply to Mikhail Rudenko

A separate firmware is needed for Broadcom 43430 revision 2. This chip can be found in e.g. certain revisions of Ampak AP6212 wireless IC. Original firmware file from IC vendor is named 'fw_bcm43436b0.bin', but brcmfmac and also btbcm drivers report chip id 43430, so requested firmware file name is 'brcmfmac43430b0-sdio.bin' in line with other 43430 revisions.

---
Changes in v2:
- use 43430B0 firmware for all 43430 revisions above 1
- add Reviewed-by tag

---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +3 -2
index 16ed325795a8..97fda7e0be7c 100644
@@ -617,6 +617,7 @@ BRCMF_FW_DEF(4339, "brcmfmac4339-sdio");
 BRCMF_FW_DEF(43430A0, "brcmfmac43430a0-sdio");
 /* Note the names are not postfixed with a1 for backward compatibility */
 BRCMF_FW_DEF(43430A1, "brcmfmac43430-sdio");
+BRCMF_FW_DEF(43430B0, "brcmfmac43430b0-sdio");
 BRCMF_FW_DEF(43455, "brcmfmac43455-sdio");
 BRCMF_FW_DEF(43456, "brcmfmac43456-sdio");
 BRCMF_FW_DEF(4354, "brcmfmac4354-sdio");
@@ -643,7 +644,8 @@ static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
 	BRCMF_FW_ENTRY(BRCM_CC_43362_CHIP_ID, 0xFFFFFFFE, 43362),
 	BRCMF_FW_ENTRY(BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, 4339),
 	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000001, 43430A0),
-	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFE, 43430A1),
+	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000002, 43430A1),
+	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFC, 43430B0),
 	BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0x00000200, 43456),
 	BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFDC0, 43455),
 	BRCMF_FW_ENTRY(BRCM_CC_4354_CHIP_ID, 0xFFFFFFFF, 4354),
@@ -4617,4 +4619,3 @@ int brcmf_sdio_sleep(struct brcmf_sdio *bus, bool sleep)
 
 	return ret;
 }
-

--
2.32.0

#9 lore raw
Quoted 9 lines · Mikhail Rudenko

A separate firmware is needed for Broadcom 43430 revision 2. This chip can be found in e.g. certain revisions of Ampak AP6212 wireless IC. Original firmware file from IC vendor is named 'fw_bcm43436b0.bin', but brcmfmac and also btbcm drivers report chip id 43430, so requested firmware file name is 'brcmfmac43430b0-sdio.bin' in line with other 43430 revisions.

Failed to apply to wireless-drivers-next, please rebase.

Recorded preimage for 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c'
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Applying: brcmfmac: use separate firmware for 43430 revision 2
Using index info to reconstruct a base tree...
M drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
CONFLICT (content): Merge conflict in drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c Patch failed at 0001 brcmfmac: use separate firmware for 43430 revision 2

Patch set to Changes Requested.

Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
#10 lore raw

PATCH v3 1/1 brcmfmac: use separate firmware for 43430 revision 2

A separate firmware is needed for Broadcom 43430 revision 2. This chip can be found in e.g. certain revisions of Ampak AP6212 wireless IC. Original firmware file from IC vendor is named 'fw_bcm43436b0.bin', but brcmfmac and also btbcm drivers report chip id 43430, so requested firmware file name is 'brcmfmac43430b0-sdio.bin' in line with other 43430 revisions.

---
Changes in v3:
- rebase against wireless-drivers-next Changes in v2:
- use 43430B0 firmware for all 43430 revisions above 1
- add Reviewed-by tag

---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +3 -2
index 97ee9e2e2e35..baabd3bc9fb1 100644
@@ -617,6 +617,7 @@ BRCMF_FW_DEF(4339, "brcmfmac4339-sdio");
 BRCMF_FW_DEF(43430A0, "brcmfmac43430a0-sdio");
 /* Note the names are not postfixed with a1 for backward compatibility */
 BRCMF_FW_CLM_DEF(43430A1, "brcmfmac43430-sdio");
+BRCMF_FW_DEF(43430B0, "brcmfmac43430b0-sdio");
 BRCMF_FW_CLM_DEF(43455, "brcmfmac43455-sdio");
 BRCMF_FW_DEF(43456, "brcmfmac43456-sdio");
 BRCMF_FW_CLM_DEF(4354, "brcmfmac4354-sdio");
@@ -643,7 +644,8 @@ static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
 	BRCMF_FW_ENTRY(BRCM_CC_43362_CHIP_ID, 0xFFFFFFFE, 43362),
 	BRCMF_FW_ENTRY(BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, 4339),
 	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000001, 43430A0),
-	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFE, 43430A1),
+	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000002, 43430A1),
+	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFC, 43430B0),
 	BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0x00000200, 43456),
 	BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFDC0, 43455),
 	BRCMF_FW_ENTRY(BRCM_CC_4354_CHIP_ID, 0xFFFFFFFF, 4354),
@@ -4616,4 +4618,3 @@ int brcmf_sdio_sleep(struct brcmf_sdio *bus, bool sleep)
 
 	return ret;
 }
-

--
2.32.0

#11 lore raw
Quoted 9 lines · Mikhail Rudenko

A separate firmware is needed for Broadcom 43430 revision 2. This chip can be found in e.g. certain revisions of Ampak AP6212 wireless IC. Original firmware file from IC vendor is named 'fw_bcm43436b0.bin', but brcmfmac and also btbcm drivers report chip id 43430, so requested firmware file name is 'brcmfmac43430b0-sdio.bin' in line with other 43430 revisions.

Patch applied to wireless-drivers-next.git, thanks.

f8d6523891cf brcmfmac: use separate firmware for 43430 revision 2

Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
#12 lore raw
In reply to Kalle Valo

Hi, Kalle!

Quoted 14 lines · Kalle Valo

Failed to apply to wireless-drivers-next, please rebase.

Recorded preimage for 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c'
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Applying: brcmfmac: use separate firmware for 43430 revision 2
Using index info to reconstruct a base tree...
M drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
CONFLICT (content): Merge conflict in drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c Patch failed at 0001 brcmfmac: use separate firmware for 43430 revision 2

Quoted 1 line

Patch set to Changes Requested.

I've posted a rebased v3 [1]. Anything else to do for this patch?

[1] https://lore.kernel.org/linux-wireless/[email protected]/

--
Kind regards,
Mikhail