From patchwork Tue Mar 13 18:38:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Escande X-Patchwork-Id: 131530 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp1083746ljb; Tue, 13 Mar 2018 11:38:40 -0700 (PDT) X-Google-Smtp-Source: AG47ELv2wDUufizSHMQ35CyEZp6/oZEsfos1QTbkk30dDlSkr4GZ+R8rdRtNC167A3dig0vgcnX2 X-Received: by 10.98.63.147 with SMTP id z19mr1505774pfj.221.1520966319885; Tue, 13 Mar 2018 11:38:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520966319; cv=none; d=google.com; s=arc-20160816; b=OBG1KoYv+My+WYCq8vFU+vgKry157bcS0Cv1Jsg9nimTbjbsYA4tD/HJ54vOZgF4VZ BWtHtCaZSFZoINrSBHBrSPNx6rkZ65HyW/PLdR0GRBo2bkb3crDBIlpj4Dom/T5mcgPr Q053j7Sfa3xpOm7+msTb6yq4A4TrPfJaNBJlQf9gBzIGHHKl+yvPqIkCLNkbccwZvJDl FFJZRVtDcT2eNQJbwt2Vd6hGQy+Jj+554Kd2y0dQ84C3zucJsNW1QlsZPJdP5BUTNMkz yj1UT0p/IZkd/5u+/Kb5XupM+JCfQG/1ZMN2YSbGYn9uZS+K1seC0RpDPLKZxt446MZq 1HOg== 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=isn4qVE3oU5X8g7irCf04R23aBI6Cy5jjfcxgv+mWOg=; b=EIoF8zre+cXd54xHJvl1bG2NGRSD12jjvUb3+kTjFyK09r9AG/aTczILn3yLWbm0zk SIkUXgG3FHhOmWWZVX4UzkjawQAxvMDkTlLYBIokcbNjq+yTIQ2Piw/NaeycL0jgvU1t 50o9mAgQ3SotadsxEO1GZCHM3VBDAdEUtAI2SrQSyJMXb5l1n74lj6FSlIkrIlbExVSO 7iH89UkQXFXSiXZaxT5r6IYkhef+ua2bqt/u5AgpQd/PbIOXPpB1REqXVx2ct4IrVRkX mOVWIVSCn8U77Uuz+buXe/TUd9wtesVRsc+RWYNgYht8jW95XkGVyDPbfmHk8nKF2IaJ Ibvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=hxASp+wK; 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 u21si580212pfl.176.2018.03.13.11.38.39; Tue, 13 Mar 2018 11:38:39 -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=hxASp+wK; 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 S1752690AbeCMSig (ORCPT + 1 other); Tue, 13 Mar 2018 14:38:36 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:46604 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752681AbeCMSie (ORCPT ); Tue, 13 Mar 2018 14:38:34 -0400 Received: by mail-wr0-f193.google.com with SMTP id m12so1660665wrm.13 for ; Tue, 13 Mar 2018 11:38:33 -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=rskfR+IB6wuy9eNFIndSemHuxejQ7J6x6uCBGohISpo=; b=hxASp+wKPVv+tO0pDNLyO1I+N8b6pbjsTzFybCdyTooqb+d41sEChfCw4VIpaTGAhX L9DbbzfGUt3Lqi7/SC+uiIVaOPmf8r/AdgZnOQKw/b64zUNcQbYuIP8Evsa4IKsqvvW1 n5p+Xntz4u7DBKN0joF5DBIqtH4cft+kjjqqE= 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=rskfR+IB6wuy9eNFIndSemHuxejQ7J6x6uCBGohISpo=; b=eItK7IP1xqIfS3jtMuw59vPQM5Dwd8vqLuY0WnXRFUnR91h+2W93guqX54JV6DMgzW 3WHgUsCCMoZ3jUAvRj7Zg6Qt9D4HEj9GrJurvgMQPTpAbAlbZNydmQqPV5nDdG3l4MD8 yr/eQweeD7G1MTCidBWAmmuoxb7IC/Ig5p4rmWf4GSQz5kjcrPC5WjvUtTH2SYylQ4is FU5/BEzSvp+EGwXOdNfaIZ6lc6x0qMCa8XVfz7e+e13tRRiCZ0FVxlCX6veOb8GUyk4i C6gDBp6j0oWToe49awkFZWLY8qNNFW+5HC74bPq6yDka8ZLK5X8UPa1j73/XXD3ekMhQ K4nQ== X-Gm-Message-State: AElRT7HMpnOwjc/dyv0mIuoKEd7WPcRSTd1D/VobPs5H5tApB9kRtKAp di1e8/KkdxQwqLwHQ1z9NUPPew== X-Received: by 10.28.69.197 with SMTP id l66mr1676670wmi.34.1520966312881; Tue, 13 Mar 2018 11:38:32 -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 q3sm549582wra.85.2018.03.13.11.38.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Mar 2018 11:38:32 -0700 (PDT) From: Thierry Escande To: Rob Herring , Andy Gross , Marcel Holtmann , Johan Hedberg , David Brown , Mark Rutland , Andy Shevchenko Cc: Bjorn Andersson , Srinivas Kandagatla , linux-bluetooth@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/3] Bluetooth: hci_qca: Add serdev support Date: Tue, 13 Mar 2018 19:38:07 +0100 Message-Id: <20180313183807.6701-4-thierry.escande@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180313183807.6701-1-thierry.escande@linaro.org> References: <20180313183807.6701-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 --- 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() drivers/bluetooth/Kconfig | 2 +- drivers/bluetooth/hci_qca.c | 109 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 108 insertions(+), 3 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..c2a6a7ebd14b 100644 --- a/drivers/bluetooth/Kconfig +++ b/drivers/bluetooth/Kconfig @@ -195,7 +195,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..aa0886d5324f 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 +/* divclk4 rate */ +#define DIVCLK4_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 *divclk4; +}; + 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(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(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->divclk4 = devm_clk_get(&serdev->dev, NULL); + if (IS_ERR(qcadev->divclk4)) { + dev_err(&serdev->dev, "failed to acquire divclk4\n"); + return PTR_ERR(qcadev->divclk4); + } + + err = clk_set_rate(qcadev->divclk4, DIVCLK4_RATE_32KHZ); + if (err) + return err; + + err = clk_prepare_enable(qcadev->divclk4); + if (err) + return err; + + err = hci_uart_register_device(&qcadev->serdev_hu, &qca_proto); + if (err) + clk_disable_unprepare(qcadev->divclk4); + + 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->divclk4); +} + +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); }