From: Rocky Liao <rjliao@codeaurora.org>
To: marcel@holtmann.org, johan.hedberg@gmail.com
Cc: mka@chromium.org, linux-kernel@vger.kernel.org,
linux-bluetooth@vger.kernel.org, linux-arm-msm@vger.kernel.org,
Rocky Liao <rjliao@codeaurora.org>
Subject: [PATCH v2 2/3] Bluetooth: hci_qca: Move the power on from open() to setup() for QCA Rome
Date: Wed, 8 Jan 2020 17:08:03 +0800 [thread overview]
Message-ID: <20200108090804.22889-2-rjliao@codeaurora.org> (raw)
In-Reply-To: <20200108090804.22889-1-rjliao@codeaurora.org>
This patch moves the btsoc power on from hdev->open() to hdev->setup() for
QCA Rome. And it calls the unified qca_power_on() API to perform the Rome
power on operation.
Signed-off-by: Rocky Liao <rjliao@codeaurora.org>
---
Changes in v2: Added this patch
drivers/bluetooth/hci_qca.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index f6555bd1adbc..8fc8c9bce9ee 100644
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -582,13 +582,8 @@ static int qca_open(struct hci_uart *hu)
hu->priv = qca;
if (hu->serdev) {
-
qcadev = serdev_device_get_drvdata(hu->serdev);
- if (!qca_is_wcn399x(qcadev->btsoc_type)) {
- gpiod_set_value_cansleep(qcadev->bt_en, 1);
- /* Controller needs time to bootup. */
- msleep(150);
- } else {
+ if (qca_is_wcn399x(qcadev->btsoc_type)) {
hu->init_speed = qcadev->init_speed;
hu->oper_speed = qcadev->oper_speed;
ret = qca_regulator_enable(qcadev);
@@ -1593,6 +1588,9 @@ static int qca_setup(struct hci_uart *hu)
return ret;
} else {
bt_dev_info(hdev, "ROME setup");
+ ret = qca_power_on(hdev);
+ if (ret)
+ return ret;
qca_set_speed(hu, QCA_INIT_SPEED);
}
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
next prev parent reply other threads:[~2020-01-08 9:08 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-07 5:26 [PATCH v1] Bluetooth: hci_qca: Add qca_power_on() API to support both wcn399x and Rome power up Rocky Liao
2020-01-07 17:31 ` Matthias Kaehlcke
2020-01-08 3:02 ` Rocky Liao
2020-01-08 9:08 ` [PATCH v2 1/3] " Rocky Liao
2020-01-08 9:08 ` Rocky Liao [this message]
2020-01-08 9:08 ` [PATCH v2 3/3] Bluetooth: hci_qca: Use unified API qca_power_on() to power up wcn399x Rocky Liao
2020-01-08 18:34 ` [PATCH v2 1/3] Bluetooth: hci_qca: Add qca_power_on() API to support both wcn399x and Rome power up Matthias Kaehlcke
2020-01-09 3:22 ` Rocky Liao
2020-01-09 3:37 ` Rocky Liao
2020-01-09 5:14 ` [PATCH v3] " Rocky Liao
2020-01-09 19:05 ` Matthias Kaehlcke
2020-01-10 3:07 ` Rocky Liao
2020-01-10 3:32 ` [PATCH v4] " Rocky Liao
2020-01-11 0:31 ` Matthias Kaehlcke
2020-01-13 3:53 ` Rocky Liao
2020-01-13 4:29 ` Rocky Liao
2020-01-13 4:31 ` Rocky Liao
2020-01-13 4:31 ` Rocky Liao
2020-01-13 4:30 ` [PATCH v5] " Rocky Liao
2020-01-14 13:55 ` Marcel Holtmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200108090804.22889-2-rjliao@codeaurora.org \
--to=rjliao@codeaurora.org \
--cc=johan.hedberg@gmail.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marcel@holtmann.org \
--cc=mka@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).