Bluetooth: hci_bcm: Add BCM4349B1 variant

The BCM4349B1, aka CYW/BCM89359, is a WiFi+BT chip and its Bluetooth
portion can be controlled over serial.

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>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c
index cfe018a6c1fca485c94777f3fdcda249a169680d..3006e2a0f37e1fa960f454ea0376f7e4e758c539 100644 (file)
--- a/drivers/bluetooth/btbcm.c
+++ b/drivers/bluetooth/btbcm.c
@@ -461,6 +461,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 4309654f95a55a3ef3b9300b192f69de97fa9a17..6f834ff1b44b164eeef036b1feba3bc984d7d957 100644 (file)
--- a/drivers/bluetooth/hci_bcm.c
+++ b/drivers/bluetooth/hci_bcm.c
@@ -1554,6 +1554,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" },
        { },