| Message ID | 20181107101308.7626-12-wens@csie.org (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | ARM: sunxi: Enable Broadcom-based Bluetooth controllers | expand |
Hi! On Wed, Nov 07, 2018 at 06:13:04PM +0800, Chen-Yu Tsai wrote: > From: Maxime Ripard <maxime.ripard@free-electrons.com> > > The BCM20702A1 chip is a single-chip Bluetooth 4.0 controller and > transceiver. It is found in the AMPAK AP6210 WiFi+BT package. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > Signed-off-by: Chen-Yu Tsai <wens@csie.org> if you resubmit it, could you do s/free-electrons/bootlin/ ? Thanks! Maxime
On Thu, Nov 8, 2018 at 4:36 AM Maxime Ripard <maxime.ripard@bootlin.com> wrote: > > Hi! > > On Wed, Nov 07, 2018 at 06:13:04PM +0800, Chen-Yu Tsai wrote: > > From: Maxime Ripard <maxime.ripard@free-electrons.com> > > > > The BCM20702A1 chip is a single-chip Bluetooth 4.0 controller and > > transceiver. It is found in the AMPAK AP6210 WiFi+BT package. > > > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > > Signed-off-by: Chen-Yu Tsai <wens@csie.org> > > if you resubmit it, could you do s/free-electrons/bootlin/ ? OK. And for the author as well? ChenYu
On Thu, Nov 08, 2018 at 02:53:33PM +0800, Chen-Yu Tsai wrote: > On Thu, Nov 8, 2018 at 4:36 AM Maxime Ripard <maxime.ripard@bootlin.com> wrote: > > > > Hi! > > > > On Wed, Nov 07, 2018 at 06:13:04PM +0800, Chen-Yu Tsai wrote: > > > From: Maxime Ripard <maxime.ripard@free-electrons.com> > > > > > > The BCM20702A1 chip is a single-chip Bluetooth 4.0 controller and > > > transceiver. It is found in the AMPAK AP6210 WiFi+BT package. > > > > > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > > > Signed-off-by: Chen-Yu Tsai <wens@csie.org> > > > > if you resubmit it, could you do s/free-electrons/bootlin/ ? > > OK. And for the author as well? Yes, please :) Maxime
diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c index e3e4d929e74f..22d4b530da03 100644 --- a/drivers/bluetooth/btbcm.c +++ b/drivers/bluetooth/btbcm.c @@ -33,6 +33,7 @@ #define VERSION "0.1" #define BDADDR_BCM20702A0 (&(bdaddr_t) {{0x00, 0xa0, 0x02, 0x70, 0x20, 0x00}}) +#define BDADDR_BCM20702A1 (&(bdaddr_t) {{0x00, 0x00, 0xa0, 0x02, 0x70, 0x20}}) #define BDADDR_BCM4324B3 (&(bdaddr_t) {{0x00, 0x00, 0x00, 0xb3, 0x24, 0x43}}) #define BDADDR_BCM4330B1 (&(bdaddr_t) {{0x00, 0x00, 0x00, 0xb1, 0x30, 0x43}}) @@ -64,6 +65,9 @@ int btbcm_check_bdaddr(struct hci_dev *hdev) * The address 00:20:70:02:A0:00 indicates a BCM20702A0 controller * with no configured address. * + * The address 20:70:02:A0:00:00 indicates a BCM20702A1 controller + * with no configured address. + * * The address 43:24:B3:00:00:00 indicates a BCM4324B3 controller * with waiting for configuration state. * @@ -71,6 +75,7 @@ int btbcm_check_bdaddr(struct hci_dev *hdev) * with waiting for configuration state. */ if (!bacmp(&bda->bdaddr, BDADDR_BCM20702A0) || + !bacmp(&bda->bdaddr, BDADDR_BCM20702A1) || !bacmp(&bda->bdaddr, BDADDR_BCM4324B3) || !bacmp(&bda->bdaddr, BDADDR_BCM4330B1)) { bt_dev_info(hdev, "BCM: Using default device address (%pMR)", @@ -330,6 +335,7 @@ static const struct bcm_subver_table bcm_uart_subver_table[] = { { 0x2209, "BCM43430A1" }, /* 001.002.009 */ { 0x6119, "BCM4345C0" }, /* 003.001.025 */ { 0x230f, "BCM4356A2" }, /* 001.003.015 */ + { 0x220e, "BCM20702A1" }, /* 001.002.014 */ { } }; diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c index bf5dee9b04d8..73b520622a24 100644 --- a/drivers/bluetooth/hci_bcm.c +++ b/drivers/bluetooth/hci_bcm.c @@ -1396,6 +1396,7 @@ static void bcm_serdev_remove(struct serdev_device *serdev) #ifdef CONFIG_OF static const struct of_device_id bcm_bluetooth_of_match[] = { + { .compatible = "brcm,bcm20702a1" }, { .compatible = "brcm,bcm43438-bt" }, { }, };