From patchwork Wed Nov 7 10:13:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 150385 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4988538ljp; Wed, 7 Nov 2018 02:19:12 -0800 (PST) X-Google-Smtp-Source: AJdET5fKNaHcUZAZnLSh6xlTKyt/GGdZWzIy/PdB8QsT0nXLspm57BjmjGj7WbUVYgwr+/EnLhjY X-Received: by 2002:a63:d818:: with SMTP id b24mr1068686pgh.174.1541585952675; Wed, 07 Nov 2018 02:19:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541585952; cv=none; d=google.com; s=arc-20160816; b=X1tGz+M8DpC1IFATe17bez5GfHrWSJ9CeKWSuIJ+rtlD/DXPByIbB82vHgPphUnspn e4EByf/1QFbd0T7xu+TdSZLRhFAUPu1lz6nFY2qs9sjwIOGQfXt5IDYfgeDdNAWJdPF7 DcS/ZeYgExhu2t857mOdH6/jOO/rAVqgmZMXHwJOoq6x87E/h7kTA6VCBi6dv6G+MIaK IfxZbhnF7t1vKCowp/4lKMQ57jQLo3Yyf5LRgrXk650Nix0+/0tuD1ctbiWKrtoCcSI9 w6h+neEIiRLAHnb065N48UKTSbAV2uUv3d5Q8rjUpD5YuJv0jLGl0V/9MyLH9NonE5TE 0ANg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=pvXQsixDEROa3n0jn3opNTz3lklAilxLmX/5eF57eGE=; b=JUJQpw3bIRxKhbYedAVz3BontEK79LD8YVflX7+o5Rm8LH6xc0R6t/+qw6xCuCRkwL MHfS3himn7KY6oof12Jzlb6y3g87qq530LcDGV4QuZKovrrycLn35b98Y+dJsZftUNZM LWNCtFpyNbKcNagD9rJUjcBgVqGddVUl8DPGOqo8LE45P7cSoidOoZWvmv0ys4HpR2Cu dxN50hBo8ucoQJb1w4r9HMCPUC2uySlBClg3XO1kg55ssu/+Y6lnLnJRUxtgDr+RIkH7 ajW/Uyxn/uHGyT7ibmeUxd6dY3TikdiwtsKD0O8K2wf1snu3+0uz549V+xxiKNGKAgO7 cNPA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w190si163616pgd.338.2018.11.07.02.19.12; Wed, 07 Nov 2018 02:19:12 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387643AbeKGTsw (ORCPT + 6 others); Wed, 7 Nov 2018 14:48:52 -0500 Received: from mirror2.csie.ntu.edu.tw ([140.112.30.76]:45496 "EHLO wens.csie.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726248AbeKGTsv (ORCPT ); Wed, 7 Nov 2018 14:48:51 -0500 X-Greylist: delayed 349 seconds by postgrey-1.27 at vger.kernel.org; Wed, 07 Nov 2018 14:48:48 EST Received: by wens.csie.org (Postfix, from userid 1000) id AF06F5FD96; Wed, 7 Nov 2018 18:13:16 +0800 (CST) From: Chen-Yu Tsai To: Marcel Holtmann , Johan Hedberg , Rob Herring , Mark Rutland , Maxime Ripard Cc: linux-sunxi@googlegroups.com, Maxime Ripard , Loic Poulain , linux-bluetooth@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Chen-Yu Tsai Subject: [PATCH 11/15] Bluetooth: hci_bcm: Add BCM20702A1 variant Date: Wed, 7 Nov 2018 18:13:04 +0800 Message-Id: <20181107101308.7626-12-wens@csie.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181107101308.7626-1-wens@csie.org> References: <20181107101308.7626-1-wens@csie.org> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Maxime Ripard 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 Signed-off-by: Chen-Yu Tsai --- drivers/bluetooth/btbcm.c | 6 ++++++ drivers/bluetooth/hci_bcm.c | 1 + 2 files changed, 7 insertions(+) -- 2.19.1 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" }, { }, };