From patchwork Wed Mar 28 09:51:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Escande X-Patchwork-Id: 132519 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp254689ljb; Wed, 28 Mar 2018 02:52:58 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+CGZvq5nNXYLh7EnS9P27WwEMHfx9QTt9lkc4f+7ZZqSqtBJKq/hJTuOtFrtXrd/0V5BlS X-Received: by 10.101.101.204 with SMTP id y12mr2115307pgv.142.1522230778676; Wed, 28 Mar 2018 02:52:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522230778; cv=none; d=google.com; s=arc-20160816; b=x0MdUGNfLZ7gmnywl6dZCIUY9SFkacQa1wZHAGVZoFR4J9e+56BEVafVD1fNAlW7mj /avKUB5OH7S2ly/942YUj5HMDPpzdDj2b/ToI5KLjRryQsUN/CiDHHCGhjUSrhoEjDIS qR4vpHHIRoT9BQQLVmrTebraHg8mVHIcLzZR9vG3Zw4tzICbSm3FqmqWqBVpOkfACBEb 5JoDnhZXCR1U96CvD/PLbZe9GwhmJFF83gvrkqRuBkKV5JQQR3ednQsUfaiWZnqNXojU r8hiZXXgz2kAfWBslMioVis1rFuCsp7XfNLoXI0+SIslZjr8B1gEmAUF+Yh80GFx0czq 1ciQ== 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=7YR9UIBD15DUPESRQgeQdO+AZNQlif3QfAF5drbBgmA=; b=GVB0R1FI3K1jZmqObU8OWdm5NTpeh+tbm98mozUXsAfCRu4aDrgFtk2QohWMNY6g3O AIpdf4QAIexS/LxKbrvGL7tAoEIqA19khYZki2/0yphTao4z7PEWdHzP9Ql1UC0VIF1R adioALQOFrlLk078DrY9xSKGbZXszPNSYg1R/ceQ5tYObkyn0xKQGStV+HrGov32A4qU ympfhJsUz/q6JWLtGv7tafmvhtr8YXiVIIzw/zoK3ae2TBKYnYReF+A9Lk6eE5Bc+DZ1 2hTDfM+BKf+rRcUB9qriPUYAJW6hOn7tVskbujfH3wiqVowysdCgopebreQ7C+w/Chb8 Ig+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=e7dlab/+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (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 s78si2532815pfj.259.2018.03.28.02.52.58; Wed, 28 Mar 2018 02:52:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=e7dlab/+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752816AbeC1Jwz (ORCPT + 28 others); Wed, 28 Mar 2018 05:52:55 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:38931 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752670AbeC1Jv6 (ORCPT ); Wed, 28 Mar 2018 05:51:58 -0400 Received: by mail-wr0-f193.google.com with SMTP id c24so1626355wrc.6 for ; Wed, 28 Mar 2018 02:51:57 -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=7YR9UIBD15DUPESRQgeQdO+AZNQlif3QfAF5drbBgmA=; b=e7dlab/+XY9lyti1c8SnUXuVAn2pygxtIYMpchegPzfsCOEj4i7slpEmpgvKE4802G RyjI/3cHpz/fjAZ7uv98YugChq5uBFa5nDPUbcxwr41S96OZw6jx50raA1KZsnS7ASzV Bq+/YnsU7c/QDZZvGams/jrecOhDtDYofkP8g= 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=7YR9UIBD15DUPESRQgeQdO+AZNQlif3QfAF5drbBgmA=; b=oybigGoq3g/nZZMVqOoYQxvXf644jN9YS+rolnzvfbvX8UTbzdThQPc6rZk2Wy3abu 2Cn6kia36wH+fytPdw7gZAQiPYO20Iq0RdbipoRZNK2VJCEEYj62I7OhoQxqB0yifhGp cmEKy8Cy8FaY3q/zb3AO4bQquozfh9Q+nXOmfvqkudLCY6jjYORk5qiUBa2N6NZLA1pw R74CCNo2slUKW0xdFC3omNO6oCzsVu4waLKjM0OlzEtO76bNDtXriGRe7ou6WInQ9kkW /G9zlXO/v8fmnt/hpihNZ8NKogcRQteLZ9os58evnOBdOayzUf1fUqrIjwmqUrJyrviV QsIQ== X-Gm-Message-State: AElRT7FHwcLZniYDxsjEU3cae0V9y7ileV45fGKpat3mnNzB2lWAX7fL lKHOFL7+9SCOQFNFwJSpnA2mYQ== X-Received: by 10.223.153.114 with SMTP id x105mr2294204wrb.108.1522230716616; Wed, 28 Mar 2018 02:51:56 -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 d9sm7285992wmh.38.2018.03.28.02.51.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Mar 2018 02:51:55 -0700 (PDT) From: Thierry Escande To: Rob Herring , Andy Gross , Marcel Holtmann , Johan Hedberg , David Brown , Mark Rutland Cc: Andy Shevchenko , Loic Poulain , 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 v6 1/3] arm64: dts: apq8096-db820c: enable bluetooth node Date: Wed, 28 Mar 2018 11:51:31 +0200 Message-Id: <20180328095133.14343-2-thierry.escande@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180328095133.14343-1-thierry.escande@linaro.org> References: <20180328095133.14343-1-thierry.escande@linaro.org> MIME-Version: 1.0 Content-Transfert-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a new serial node for the Qualcomm BT controller QCA6174. This allows automatic probing and hci registration through the serdev framework instead of relying on the userspace helpers. Signed-off-by: Thierry Escande --- v6 - Move gpio properties into pinconf subnode - move pinmux properties into mux and config subnodes v5: - Rename 'bt-disable-n' gpio as 'enable' v4: no change v3: no change v2: - Fix author email arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi | 26 +++++++++++++++++ .../boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi | 21 ++++++++++++++ arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 33 ++++++++++++++++++++++ arch/arm64/boot/dts/qcom/msm8996.dtsi | 10 +++++++ 4 files changed, 90 insertions(+) -- 2.14.1 diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi index 24552f19b3fa..6a573875d45a 100644 --- a/arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi @@ -36,4 +36,30 @@ drive-strength = <2>; /* 2 MA */ }; }; + + blsp1_uart1_default: blsp1_uart1_default { + mux { + pins = "gpio41", "gpio42", "gpio43", "gpio44"; + function = "blsp_uart2"; + }; + + config { + pins = "gpio41", "gpio42", "gpio43", "gpio44"; + drive-strength = <16>; + bias-disable; + }; + }; + + blsp1_uart1_sleep: blsp1_uart1_sleep { + mux { + pins = "gpio41", "gpio42", "gpio43", "gpio44"; + function = "gpio"; + }; + + config { + pins = "gpio41", "gpio42", "gpio43", "gpio44"; + drive-strength = <2>; + bias-disable; + }; + }; }; diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi index 59b29ddfb6e9..0a8cf7e5974f 100644 --- a/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi @@ -26,6 +26,27 @@ }; }; + divclk4_pin_a: divclk4 { + pinconf { + pins = "gpio18"; + function = PMIC_GPIO_FUNC_FUNC2; + + bias-disable; + power-source = ; + }; + }; + + bt_en_pin_a: bt-en-active { + pinconf { + pins = "gpio19"; + function = PMIC_GPIO_FUNC_NORMAL; + + output-low; + power-source = ; // 1.8V + qcom,drive-strength = ; + }; + }; + usb3_vbus_det_gpio: pm8996_gpio22 { pinconf { pins = "gpio22"; diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi index 1c8f1b86472d..8b3bcdf0d718 100644 --- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi @@ -23,6 +23,7 @@ aliases { serial0 = &blsp2_uart1; serial1 = &blsp2_uart2; + serial2 = &blsp1_uart1; i2c0 = &blsp1_i2c2; i2c1 = &blsp2_i2c1; i2c2 = &blsp2_i2c0; @@ -34,7 +35,39 @@ stdout-path = "serial0:115200n8"; }; + clocks { + divclk4: divclk4 { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <32768>; + clock-output-names = "divclk4"; + + pinctrl-names = "default"; + pinctrl-0 = <&divclk4_pin_a>; + }; + }; + soc { + serial@7570000 { + label = "BT-UART"; + status = "okay"; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&blsp1_uart1_default>; + pinctrl-1 = <&blsp1_uart1_sleep>; + + bluetooth { + compatible = "qcom,qca6174-bt"; + + /* bt_disable_n gpio */ + enable-gpios = <&pm8994_gpios 19 GPIO_ACTIVE_HIGH>; + + pinctrl-names = "default"; + pinctrl-0 = <&bt_en_pin_a>; + + clocks = <&divclk4>; + }; + }; + serial@75b0000 { label = "LS-UART1"; status = "okay"; diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 0a6f7952bbb1..2d54a86a027f 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -408,6 +408,16 @@ #clock-cells = <1>; }; + blsp1_uart1: serial@7570000 { + compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm"; + reg = <0x07570000 0x1000>; + interrupts = ; + clocks = <&gcc GCC_BLSP1_UART2_APPS_CLK>, + <&gcc GCC_BLSP1_AHB_CLK>; + clock-names = "core", "iface"; + status = "disabled"; + }; + blsp1_spi0: spi@7575000 { compatible = "qcom,spi-qup-v2.2.1"; reg = <0x07575000 0x600>; From patchwork Wed Mar 28 09:51:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Escande X-Patchwork-Id: 132517 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp254147ljb; Wed, 28 Mar 2018 02:52:17 -0700 (PDT) X-Google-Smtp-Source: AIpwx48EhFgjW22/FaGD6bI2Ij6y0Um6fYI/uypld5SnDrEBu4oVcm6j3j7d/n+T5IsyhJQb7oUu X-Received: by 10.101.81.75 with SMTP id g11mr2066607pgq.143.1522230737080; Wed, 28 Mar 2018 02:52:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522230737; cv=none; d=google.com; s=arc-20160816; b=QkUUFyYyuFZf4zr9u7RcDSJuc4XfmjxxxjSG/3d8YYt13f1eEw7hfIHW7Muc9lbsSw cFCUSNTjb7IAVcUN27vbjSfUNDvc/mU7WqEojjS9uGrDvkYtPJzq/kdpnxLy1Aibg/bf Z+LfXp5QxKbAUpD2abqI4XmVOFv2nz5tmRNmds58nSMYU7BBznfeQqPkz/QiJt2+eTWV 4I0BIRqyie1beAX9BtLM1ZN2mmdT3p7pU7OPqTyjxVCWDgWcTXi5pV8X+Jsv+sXZIajw lCxxO2njgRMh19b3oRk6cXa2IuR3jZCFddTlGdwaMHW8OInJBrxj536M831uG/GvSzzJ wJKA== 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=EbTg1kjwC8/UrdHMhnBc7OfvRhjZouqhKnJ+9hkddP4=; b=btkRVXVhRP78KqozjcOvxEtaODLyjtgmnxdx+Jb/LM1JnhrrkfIa/c9NPsxTxf1QeL LLwxx3ELiQysiBHiyrwcGg07mG6WxptDpN8W1o0stN/P5ppiWUcv8DJwN4knE34pLikw PBIbfeQa9tY/hpaepR+AXmST9dTVat6MJRwumm9XWGy5QGwucBCuNyiuYAzIWAcuY5hH Uv5engYHv1tPE/R12hJw+YHBTOoFOQOcQ09Vssircm3aZtdokzAW8SskTNkq2dBXH31N 4s0SvN/wT92G59GenIbiaaG9QYytAQxL5Ex2CB27Vy+FTkd4XMc1OR5ImZOSBIaIjO12 cmlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fidzgl/k; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (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 e6si2204460pgt.442.2018.03.28.02.52.16; Wed, 28 Mar 2018 02:52:17 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fidzgl/k; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752753AbeC1JwP (ORCPT + 28 others); Wed, 28 Mar 2018 05:52:15 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:33338 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752689AbeC1JwA (ORCPT ); Wed, 28 Mar 2018 05:52:00 -0400 Received: by mail-wm0-f68.google.com with SMTP id o23so13326790wmf.0 for ; Wed, 28 Mar 2018 02:51:59 -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=EbTg1kjwC8/UrdHMhnBc7OfvRhjZouqhKnJ+9hkddP4=; b=fidzgl/khxmhTXbf+ocqxb2hWmLv3Q6i7723ay5KLnT5CrjKM6Ue26okUjB+WqoONb WLFMGnvwp3zw/FJMAjG8158caQbmrALYLSMSn3eDZHk/l5W9pkWMdP1DkW6Ip/aoqQNU zO8yX7vERKmG6pXOt0bhRRyyvnilFQLQ8aLQQ= 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=EbTg1kjwC8/UrdHMhnBc7OfvRhjZouqhKnJ+9hkddP4=; b=Oa4nA2OgCnCDTPpIpZ37I84fjeQU8syY5lyUdEUVvH2TfgpUIh//YBbUsxg5GDkcZL s8dyeAXosjCxDSuYlJ2eFBAGC76m9yOUYiqdabKAEXgGh8oL9oM8K9UyL55QpmKiUT8K n5riVldsFllSCaweK4eoxyQnT4ohe08UND/MNi9+ni+ewX513t0rvsHza/15xXiah7jc PyiBgqi2CYS/+u0KdKssoP9glEQVVgbMW5xPN0JKrqMYe8KRNAVB/NJeMkTrYGiW8691 er59ORkmB6+gpzCcRWVP8HX7rQ7uAIZccStRBmxxLIOpB1RuzDj8jHZE7OJreKcvBqze xm3w== X-Gm-Message-State: AElRT7GfZ8Io034vVNR1N+1mJwUzG3VlOeHk02FidGfYflK+ATnV1a38 2pYVvqvKNNEvYfmmPwJHELGijA== X-Received: by 10.28.109.131 with SMTP id b3mr1883191wmi.145.1522230718996; Wed, 28 Mar 2018 02:51:58 -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 d9sm7285992wmh.38.2018.03.28.02.51.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Mar 2018 02:51:58 -0700 (PDT) From: Thierry Escande To: Rob Herring , Andy Gross , Marcel Holtmann , Johan Hedberg , David Brown , Mark Rutland Cc: Andy Shevchenko , Loic Poulain , 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 v6 3/3] Bluetooth: hci_qca: Add serdev support Date: Wed, 28 Mar 2018 11:51:33 +0200 Message-Id: <20180328095133.14343-4-thierry.escande@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180328095133.14343-1-thierry.escande@linaro.org> References: <20180328095133.14343-1-thierry.escande@linaro.org> MIME-Version: 1.0 Content-Transfert-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 Reviewed-by: Andy Shevchenko --- v6: - Fix gpio name in error message v5: - Use gpio new name 'enable' 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 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..1c4475d0707c 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, "enable", + GPIOD_OUT_LOW); + if (IS_ERR(qcadev->bt_en)) { + dev_err(&serdev->dev, "failed to acquire enable 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); }