From patchwork Wed Mar 14 15:55:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Escande X-Patchwork-Id: 131651 Delivered-To: patch@linaro.org Received: by 10.46.89.16 with SMTP id n16csp2183968ljb; Wed, 14 Mar 2018 08:56:05 -0700 (PDT) X-Google-Smtp-Source: AG47ELtEWO8rVHRADB3X1uKU++HhIsF5gT6J5Gf7hFoUR7xY5I1hgn5UvPn7Cl2nsePWuxfiztBL X-Received: by 10.99.64.197 with SMTP id n188mr4105274pga.21.1521042965069; Wed, 14 Mar 2018 08:56:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521042965; cv=none; d=google.com; s=arc-20160816; b=eGgxR1LEc3Ojrn4vkxxaStCnGPLy9brPbMmBYsm6tJtebyERvqfajloE0hMtn5Qnie wdKlETotVpAU9kQHppaagMw5gN/GfSMCh45J8+PhsEjWYo816K1OAIeXdHdL4fwmf1H3 k3S8T4eL+dNLrp7mlqhsdwU6vMQ9qLX4JJO2Xd5r4iKlfjVnzcpNHj6nLP5Ws1PawBdr GJTWoJRoAf0Bfh4LDckQ69JQakbVXjNDIqkO1sKasAiW7/MZzGPslhkHUc9998EKn5Ag Ek4yJHJEd/6Nypa35O0JbXs2MakYTMzztzhey07PpXy95izm+lE/m90HEhh/Docokqvj cHbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfert-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=UNRUchNtvZO/1qr9CAqC0AUwwk3C3m0fowgS+gr+NWU=; b=UXPccQaXAUZ4Z+zLryyZ77UvzWskdm9ontVNbb4P4S3pgvo9ryQ5DvJO7H/mTiF3DN XSjnFbjImTXeVTAbCJOwLmZaRyoZAiT574QTwJppMW1vCRk7qGBRcnywXmOBkudb/1Ee 9rJiqVUhaENNOoWIjpFPOR0GoWG+wkmbxvz5GpQr0KCkfzWgMmJYY+9Mhe8dfoTWtx7D Nx6LxWW4bOn9ejF290f6vUsgsh/UFdQvjKICWm1ncCXChex+i9kpB1vBRf0OFfBwki+Z vJWxKTJy4xoNBQa/fR5CX8uVDmnASzR1zTbC3s/fAHElmVBbXHExR0csGPDpXB1OA3qC HfjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=kF7BlCAN; spf=pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c12-v6si2063086pls.325.2018.03.14.08.56.04; Wed, 14 Mar 2018 08:56:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=kF7BlCAN; spf=pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751488AbeCNP4C (ORCPT + 1 other); Wed, 14 Mar 2018 11:56:02 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:37546 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752435AbeCNPzo (ORCPT ); Wed, 14 Mar 2018 11:55:44 -0400 Received: by mail-wr0-f193.google.com with SMTP id z12so5301950wrg.4 for ; Wed, 14 Mar 2018 08:55:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfert-encoding; bh=7QYQLL2qzHQb0Y204t/Nm5anLmm24mxmKLeqOn1Jb/E=; b=kF7BlCANKFY1tUyFvr015qV1zKedoXEhTYhGsh51OdZvFtVBsyA2OrLLSZpM9QO3T0 gFhKiftZr3gOyofpwhYatwGznfHr8hASMoLFlKXEN2atmEo9OzsiJs4QSAO0rJXPji1P iHgAaCZQcnNNEf8XW/fiow6BnZV9Q9KCPdtyE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfert-encoding; bh=7QYQLL2qzHQb0Y204t/Nm5anLmm24mxmKLeqOn1Jb/E=; b=iG7NBdDL6RHls1oX3wm59sbLa2mQrXt4xA7KhmkFQk9NYp1+Tu0g8+2HX0l7CJxM1e 4wn1+i0GPTnK41SIKqGzncI7YDi9lHMdYdp/8IWQC2tkfr8QiBCA+yyvP7qXrldGq5+W hzql8hkeUD4vLzM5Jck69BHNizRoVdkXdQQbQ0+prJA2sWa5Lov0lAhJU+afAtNDCSNw ZcgxphRjgY3pAa1exUj0IvMLyXf8h31/GIFzR2fuPm7lnpcWnvUEqOKZ9e89wPWg/4ph KKix+hRPO6uwxjAxWBM9zkAeyXvtc+qfFtd+kAsKx2+ZDPTkPTnQIyS+1o+BxeBIAfU0 1IaQ== X-Gm-Message-State: AElRT7E+TsQczlRJF8JARGCSrH/qS45am3cdziK1ljeON8jPCA6gWAul qKvMNxHk9ZMwxmzcRpCanH4NNA== X-Received: by 10.223.166.135 with SMTP id t7mr4252794wrc.260.1521042942570; Wed, 14 Mar 2018 08:55:42 -0700 (PDT) Received: from localhost.localdomain (aig34-1-88-167-228-121.fbx.proxad.net. [88.167.228.121]) by smtp.gmail.com with ESMTPSA id n127sm1418909wmb.5.2018.03.14.08.55.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Mar 2018 08:55:42 -0700 (PDT) From: Thierry Escande To: Rob Herring , Andy Gross , Marcel Holtmann , Johan Hedberg , David Brown , Mark Rutland , Andy Shevchenko , Loic Poulain , Bjorn Andersson Cc: Srinivas Kandagatla , linux-bluetooth@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 3/3] Bluetooth: hci_qca: Add serdev support Date: Wed, 14 Mar 2018 16:55:14 +0100 Message-Id: <20180314155514.3374-4-thierry.escande@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180314155514.3374-1-thierry.escande@linaro.org> References: <20180314155514.3374-1-thierry.escande@linaro.org> MIME-Version: 1.0 Content-Transfert-Encoding: 8bit Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Add support for Qualcomm serial slave devices. Probe the serial device, retrieve its maximum speed and register a new hci uart device. Signed-off-by: Thierry Escande --- v4: - Rename divclk4 as susclk (its name in the bt chip) - Use gpiod_set_value_cansleep() - Replace #include with - Restore dependency on BT_HCIUART v3: - Remove redundant call to gpiod_set_value() after devm_gpiod_get() - Check returned values for clk_set_rate() and clk_prepare_enable() - Use clk_disable_unprepare() v2: - Fix author email drivers/bluetooth/Kconfig | 1 + drivers/bluetooth/hci_qca.c | 109 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 108 insertions(+), 2 deletions(-) -- 2.14.1 -- To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig index 07e55cd8f8c8..e0f1a6609b68 100644 --- a/drivers/bluetooth/Kconfig +++ b/drivers/bluetooth/Kconfig @@ -196,6 +196,7 @@ config BT_HCIUART_BCM config BT_HCIUART_QCA bool "Qualcomm Atheros protocol support" depends on BT_HCIUART + depends on BT_HCIUART_SERDEV select BT_HCIUART_H4 select BT_QCA help diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index 05ec530b8a3a..6cf0d1d4595a 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -29,7 +29,11 @@ */ #include +#include #include +#include +#include +#include #include #include @@ -50,6 +54,9 @@ #define IBS_TX_IDLE_TIMEOUT_MS 2000 #define BAUDRATE_SETTLE_TIMEOUT_MS 300 +/* susclk rate */ +#define SUSCLK_RATE_32KHZ 32768 + /* HCI_IBS transmit side sleep protocol states */ enum tx_ibs_states { HCI_IBS_TX_ASLEEP, @@ -111,6 +118,12 @@ struct qca_data { u64 votes_off; }; +struct qca_serdev { + struct hci_uart serdev_hu; + struct gpio_desc *bt_en; + struct clk *susclk; +}; + static void __serial_clock_on(struct tty_struct *tty) { /* TODO: Some chipset requires to enable UART clock on client @@ -386,6 +399,7 @@ static void hci_ibs_wake_retrans_timeout(struct timer_list *t) /* Initialize protocol */ static int qca_open(struct hci_uart *hu) { + struct qca_serdev *qcadev; struct qca_data *qca; BT_DBG("hu %p qca_open", hu); @@ -444,6 +458,13 @@ static int qca_open(struct hci_uart *hu) timer_setup(&qca->tx_idle_timer, hci_ibs_tx_idle_timeout, 0); qca->tx_idle_delay = IBS_TX_IDLE_TIMEOUT_MS; + if (hu->serdev) { + serdev_device_open(hu->serdev); + + qcadev = serdev_device_get_drvdata(hu->serdev); + gpiod_set_value_cansleep(qcadev->bt_en, 1); + } + BT_DBG("HCI_UART_QCA open, tx_idle_delay=%u, wake_retrans=%u", qca->tx_idle_delay, qca->wake_retrans); @@ -512,6 +533,7 @@ static int qca_flush(struct hci_uart *hu) /* Close protocol */ static int qca_close(struct hci_uart *hu) { + struct qca_serdev *qcadev; struct qca_data *qca = hu->priv; BT_DBG("hu %p qca close", hu); @@ -525,6 +547,13 @@ static int qca_close(struct hci_uart *hu) destroy_workqueue(qca->workqueue); qca->hu = NULL; + if (hu->serdev) { + serdev_device_close(hu->serdev); + + qcadev = serdev_device_get_drvdata(hu->serdev); + gpiod_set_value_cansleep(qcadev->bt_en, 0); + } + kfree_skb(qca->rx_skb); hu->priv = NULL; @@ -885,6 +914,14 @@ static int qca_set_baudrate(struct hci_dev *hdev, uint8_t baudrate) return 0; } +static inline void host_set_baudrate(struct hci_uart *hu, unsigned int speed) +{ + if (hu->serdev) + serdev_device_set_baudrate(hu->serdev, speed); + else + hci_uart_set_baudrate(hu, speed); +} + static int qca_setup(struct hci_uart *hu) { struct hci_dev *hdev = hu->hdev; @@ -905,7 +942,7 @@ static int qca_setup(struct hci_uart *hu) speed = hu->proto->init_speed; if (speed) - hci_uart_set_baudrate(hu, speed); + host_set_baudrate(hu, speed); /* Setup user speed if needed */ speed = 0; @@ -924,7 +961,7 @@ static int qca_setup(struct hci_uart *hu) ret); return ret; } - hci_uart_set_baudrate(hu, speed); + host_set_baudrate(hu, speed); } /* Setup patch / NVM configurations */ @@ -958,12 +995,80 @@ static struct hci_uart_proto qca_proto = { .dequeue = qca_dequeue, }; +static int qca_serdev_probe(struct serdev_device *serdev) +{ + struct qca_serdev *qcadev; + int err; + + qcadev = devm_kzalloc(&serdev->dev, sizeof(*qcadev), GFP_KERNEL); + if (!qcadev) + return -ENOMEM; + + qcadev->serdev_hu.serdev = serdev; + serdev_device_set_drvdata(serdev, qcadev); + + qcadev->bt_en = devm_gpiod_get(&serdev->dev, "bt-disable-n", + GPIOD_OUT_LOW); + if (IS_ERR(qcadev->bt_en)) { + dev_err(&serdev->dev, "failed to acquire bt-disable-n gpio\n"); + return PTR_ERR(qcadev->bt_en); + } + + qcadev->susclk = devm_clk_get(&serdev->dev, NULL); + if (IS_ERR(qcadev->susclk)) { + dev_err(&serdev->dev, "failed to acquire clk\n"); + return PTR_ERR(qcadev->susclk); + } + + err = clk_set_rate(qcadev->susclk, SUSCLK_RATE_32KHZ); + if (err) + return err; + + err = clk_prepare_enable(qcadev->susclk); + if (err) + return err; + + err = hci_uart_register_device(&qcadev->serdev_hu, &qca_proto); + if (err) + clk_disable_unprepare(qcadev->susclk); + + return err; +} + +static void qca_serdev_remove(struct serdev_device *serdev) +{ + struct qca_serdev *qcadev = serdev_device_get_drvdata(serdev); + + hci_uart_unregister_device(&qcadev->serdev_hu); + + clk_disable_unprepare(qcadev->susclk); +} + +static const struct of_device_id qca_bluetooth_of_match[] = { + { .compatible = "qcom,qca6174-bt" }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, qca_bluetooth_of_match); + +static struct serdev_device_driver qca_serdev_driver = { + .probe = qca_serdev_probe, + .remove = qca_serdev_remove, + .driver = { + .name = "hci_uart_qca", + .of_match_table = qca_bluetooth_of_match, + }, +}; + int __init qca_init(void) { + serdev_device_driver_register(&qca_serdev_driver); + return hci_uart_register_proto(&qca_proto); } int __exit qca_deinit(void) { + serdev_device_driver_unregister(&qca_serdev_driver); + return hci_uart_unregister_proto(&qca_proto); }