Commit deeddfd2 authored by Ahmad Fatoum's avatar Ahmad Fatoum Committed by Zheng Zengkai
Browse files

Bluetooth: hci_bcm: Add BCM4349B1 variant 

stable inclusion
from stable-v5.10.136
commit 033a4455d9d6ccba0f8acbf297d3094b78ee409e
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5ZWNE

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=033a4455d9d6ccba0f8acbf297d3094b78ee409e



--------------------------------

commit 4f17c2b6 upstream.

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: default avatarAhmad Fatoum <a.fatoum@pengutronix.de>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: default avatarWei Li <liwei391@huawei.com>
parent b884af0f

drivers/bluetooth/btbcm.c

+2 −0
Original line number Diff line number Diff line
@@ -401,6 +401,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 */

drivers/bluetooth/hci_bcm.c

+1 −0
Original line number Diff line number Diff line
@@ -1489,6 +1489,7 @@ static const struct of_device_id bcm_bluetooth_of_match[] = { 
	{ .compatible = "brcm,bcm4345c5" },

	{ .compatible = "brcm,bcm4330-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" },

	{ },