[PATCH 1/2] dt-bindings: bluetooth: broadcom: Add BCM4349B1 DT binding

[PATCH 1/2] dt-bindings: bluetooth: broadcom: Add BCM4349B1 DT binding

[Ahmad Fatoum]

The BCM4349B1 chip is a single-chip Bluetooth 5.0 controller and
Transceiver. It is contained in the CYW/BCM89359 WiFi+BT package.
Extend the binding with its DT compatible.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
To: Marcel Holtmann <marcel@holtmann.org>
To: Johan Hedberg <johan.hedberg@gmail.com>
To: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To: Rob Herring <robh+dt@kernel.org>
To: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
Cc: linux-kernel@vger.kernel.org
Cc: linux-bluetooth@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: linux-kernel@vger.kernel.org
To: devicetree@vger.kernel.org
Cc: netdev@vger.kernel.org
---
 Documentation/devicetree/bindings/net/broadcom-bluetooth.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/net/broadcom-bluetooth.yaml b/Documentation/devicetree/bindings/net/broadcom-bluetooth.yaml
index 5aac094fd217..58ecafc1b7f9 100644
--- a/Documentation/devicetree/bindings/net/broadcom-bluetooth.yaml
+++ b/Documentation/devicetree/bindings/net/broadcom-bluetooth.yaml
@@ -23,6 +23,7 @@ properties:
       - brcm,bcm4345c5
       - brcm,bcm43540-bt
       - brcm,bcm4335a0
+      - brcm,bcm4349-bt
 
   shutdown-gpios:
     maxItems: 1
-- 
2.30.2

[PATCH 2/2] Bluetooth: hci_bcm: Add BCM4349B1 variant

[Ahmad Fatoum]

The BCM4349B1 chip is a single-chip Bluetooth 5.0 controller and
transceiver. It is contained in the CYW/BCM89359 WiFi+BT package.

Two subversions are added for the chip, because ROM firmware reports
002.002.013 (at least for the chips I have here), while depending on
patchram firmware revision, either 002.002.013 or 002.002.014 is
reported.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
To: Marcel Holtmann <marcel@holtmann.org>
To: Johan Hedberg <johan.hedberg@gmail.com>
To: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
Cc: linux-kernel@vger.kernel.org
Cc: linux-bluetooth@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: linux-kernel@vger.kernel.org
Cc: devicetree@vger.kernel.org
Cc: netdev@vger.kernel.org
---
 drivers/bluetooth/btbcm.c   | 2 ++
 drivers/bluetooth/hci_bcm.c | 1 +
 2 files changed, 3 insertions(+)

diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c
index d9ceca7a7935..a18f289d7346 100644
--- a/drivers/bluetooth/btbcm.c
+++ b/drivers/bluetooth/btbcm.c
@@ -453,6 +453,8 @@ static const struct bcm_subver_table bcm_uart_subver_table[] = {
 	{ 0x6606, "BCM4345C5"	},	/* 003.006.006 */
 	{ 0x230f, "BCM4356A2"	},	/* 001.003.015 */
 	{ 0x220e, "BCM20702A1"  },	/* 001.002.014 */
+	{ 0x420d, "BCM4349B1"	},	/* 002.002.013 */
+	{ 0x420e, "BCM4349B1"	},	/* 002.002.014 */
 	{ 0x4217, "BCM4329B1"   },	/* 002.002.023 */
 	{ 0x6106, "BCM4359C0"	},	/* 003.001.006 */
 	{ 0x4106, "BCM4335A0"	},	/* 002.001.006 */
diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
index 785f445dd60d..d0a6f9ff4e08 100644
--- a/drivers/bluetooth/hci_bcm.c
+++ b/drivers/bluetooth/hci_bcm.c
@@ -1544,6 +1544,7 @@ static const struct of_device_id bcm_bluetooth_of_match[] = {
 	{ .compatible = "brcm,bcm43430a0-bt" },
 	{ .compatible = "brcm,bcm43430a1-bt" },
 	{ .compatible = "brcm,bcm43438-bt", .data = &bcm43438_device_data },
+	{ .compatible = "brcm,bcm4349-bt", .data = &bcm43438_device_data },
 	{ .compatible = "brcm,bcm43540-bt", .data = &bcm4354_device_data },
 	{ .compatible = "brcm,bcm4335a0" },
 	{ },
-- 
2.30.2

Re: [PATCH 1/2] dt-bindings: bluetooth: broadcom: Add BCM4349B1 DT binding

[Krzysztof Kozlowski]

On 21/05/2022 22:07, Ahmad Fatoum wrote:
> The BCM4349B1 chip is a single-chip Bluetooth 5.0 controller and
> Transceiver. It is contained in the CYW/BCM89359 WiFi+BT package.
> Extend the binding with its DT compatible.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>


Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>


Best regards,
Krzysztof

Re: [PATCH 1/2] dt-bindings: bluetooth: broadcom: Add BCM4349B1 DT binding

[Linus Walleij]

On Sat, May 21, 2022 at 10:07 PM Ahmad Fatoum <a.fatoum@pengutronix.de> wrote:

> The BCM4349B1 chip is a single-chip Bluetooth 5.0 controller and
> Transceiver. It is contained in the CYW/BCM89359 WiFi+BT package.

So the BT and the package have two different names.

> +      - brcm,bcm4349-bt

Then why do you have to tag on "-bt" on this compatible?

That is typically used when the wifi and bt has the *same* name, so
the only way to distinguish between them is a suffix.

Yours,
Linus Walleij

Re: [PATCH 1/2] dt-bindings: bluetooth: broadcom: Add BCM4349B1 DT binding

[Ahmad Fatoum]

On 22.05.22 23:03, Linus Walleij wrote:
> On Sat, May 21, 2022 at 10:07 PM Ahmad Fatoum <a.fatoum@pengutronix.de> wrote:
> 
>> The BCM4349B1 chip is a single-chip Bluetooth 5.0 controller and
>> Transceiver. It is contained in the CYW/BCM89359 WiFi+BT package.
> 
> So the BT and the package have two different names.

The package also goes by the name BCM4349B1 apparently.
Cypress support had later confirmed BCM4349B1 and BCM89359 to
be the same chipset. I should probably rephrase the commit message.


>> +      - brcm,bcm4349-bt
> 
> Then why do you have to tag on "-bt" on this compatible?
> 
> That is typically used when the wifi and bt has the *same* name, so
> the only way to distinguish between them is a suffix.
I think that's the case here too.

Cheers,
Ahmad

> 
> Yours,
> Linus Walleij
> 


-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: [PATCH 1/2] dt-bindings: bluetooth: broadcom: Add BCM4349B1 DT binding

[Linus Walleij]

On Mon, May 23, 2022 at 12:16 AM Ahmad Fatoum <a.fatoum@pengutronix.de> wrote:
> On 22.05.22 23:03, Linus Walleij wrote:
> > On Sat, May 21, 2022 at 10:07 PM Ahmad Fatoum <a.fatoum@pengutronix.de> wrote:
> >
> >> The BCM4349B1 chip is a single-chip Bluetooth 5.0 controller and
> >> Transceiver. It is contained in the CYW/BCM89359 WiFi+BT package.
> >
> > So the BT and the package have two different names.
>
> The package also goes by the name BCM4349B1 apparently.
> Cypress support had later confirmed BCM4349B1 and BCM89359 to
> be the same chipset. I should probably rephrase the commit message.
>
>
> >> +      - brcm,bcm4349-bt
> >
> > Then why do you have to tag on "-bt" on this compatible?
> >
> > That is typically used when the wifi and bt has the *same* name, so
> > the only way to distinguish between them is a suffix.

> I think that's the case here too.

OK then!
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij