| From e6ef5e121ece034452f962b66192aed5c75a7d07 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 17 Apr 2020 19:15:32 +0200 |
| Subject: Bluetooth: btbcm: Add 2 missing models to subver tables |
| |
| From: Hans de Goede <hdegoede@redhat.com> |
| |
| [ Upstream commit c03ee9af4e07112bd3fc688daca9e654f41eca93 ] |
| |
| Currently the bcm_uart_subver_ and bcm_usb_subver_table-s lack entries |
| for the BCM4324B5 and BCM20703A1 chipsets. This makes the code use just |
| "BCM" as prefix for the filename to pass to request-firmware, making it |
| harder for users to figure out which firmware they need. This especially |
| is problematic with the UART attached BCM4324B5 where this leads to the |
| filename being just "BCM.hcd". |
| |
| Add the 2 missing devices to subver tables. This has been tested on: |
| |
| 1. A Dell XPS15 9550 where this makes btbcm.c try to load |
| "BCM20703A1-0a5c-6410.hcd" before it tries to load "BCM-0a5c-6410.hcd". |
| |
| 2. A Thinkpad 8 where this makes btbcm.c try to load |
| "BCM4324B5.hcd" before it tries to load "BCM.hcd" |
| |
| Signed-off-by: Hans de Goede <hdegoede@redhat.com> |
| Signed-off-by: Marcel Holtmann <marcel@holtmann.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/bluetooth/btbcm.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c |
| index 1f498f358f60..e1377934507c 100644 |
| --- a/drivers/bluetooth/btbcm.c |
| +++ b/drivers/bluetooth/btbcm.c |
| @@ -380,6 +380,7 @@ static const struct bcm_subver_table bcm_uart_subver_table[] = { |
| { 0x410e, "BCM43341B0" }, /* 002.001.014 */ |
| { 0x4204, "BCM2076B1" }, /* 002.002.004 */ |
| { 0x4406, "BCM4324B3" }, /* 002.004.006 */ |
| + { 0x4606, "BCM4324B5" }, /* 002.006.006 */ |
| { 0x6109, "BCM4335C0" }, /* 003.001.009 */ |
| { 0x610c, "BCM4354" }, /* 003.001.012 */ |
| { 0x2122, "BCM4343A0" }, /* 001.001.034 */ |
| @@ -395,6 +396,7 @@ static const struct bcm_subver_table bcm_uart_subver_table[] = { |
| }; |
| |
| static const struct bcm_subver_table bcm_usb_subver_table[] = { |
| + { 0x2105, "BCM20703A1" }, /* 001.001.005 */ |
| { 0x210b, "BCM43142A0" }, /* 001.001.011 */ |
| { 0x2112, "BCM4314A0" }, /* 001.001.018 */ |
| { 0x2118, "BCM20702A0" }, /* 001.001.024 */ |
| -- |
| 2.25.1 |
| |
