From patchwork Tue Mar 20 03:23:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Escande X-Patchwork-Id: 132114 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp342351ljb; Mon, 19 Mar 2018 20:24:11 -0700 (PDT) X-Google-Smtp-Source: AG47ELudyTF6rFcO/y8fasaw+owwSBxD9RXGYA3g1E4TP3V1XrFYmmLvNeG9zoK/Na+2JKcTJ++1 X-Received: by 2002:a17:902:24:: with SMTP id 33-v6mr14864389pla.341.1521516251024; Mon, 19 Mar 2018 20:24:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521516251; cv=none; d=google.com; s=arc-20160816; b=RL7UNCClvm4yuExLWkdXzWd3uQjADMWrwO1wugBy6Z4j9fqBFna1ATVqIIQmZom2GZ sUsZu4AsFAfM14klL3BNjEefi7cw58wlPQSQ+OKF7XzkPSE+BeCXTtm5+yr/zGH0GQZi 4kLit0zS9EkTF2M/397y4rH0XQm4Lr5+AGcZJDi+v6nhAOv8lI74xTdk5ROnaOTHsR25 WWi6FVNQMfUkLPR4eb4AIyrMxIvOUuZ7zMhch8QGu5Y+rCeeNcjKhgtorHhHUXxREH/t peqa+99gDC/hOn44rJLBTWOMSWclr5nhWI22WLt/A1IhOUK+YcUuyZ/KoIPVWazTTDRs UsTg== 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=VAI1Ag/xQtFEBXqUJDZLbckj9D6faTfmHzP0S4L0CSg=; b=Irzl8cZJR4Wc/9zWnupJR4gZuBKqy6kzgSkYURO2j/h/Bi0nK5BgA+nUUdNxD08fQJ YTrQ7a5IM+JWw38mxbVrSvbse0Rbe7sMsSYt3xGWhQa53GlSeHSuddtnB6UR6Fvz3Wuq CK13uNmFXWcT+wfP6eXkGb4Dq3YTGv7mDiIOaIXCyba95LPg7fotkN9FKStDpnlGd9nJ OTSsagA4hZSip03VQbY2pRHKnYsOUSewNdxFaE8bWXGkrgyUyJog+FndZ5C0ERcShoBO H9WURdyJ8Kc3NOG/2CqHUmEahGy63mYCDPg44QgLo2MJPNs/lwIhH5peEKmj+uV+i5RU tOGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=jkA3g98h; 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 w2si535527pgm.458.2018.03.19.20.24.10; Mon, 19 Mar 2018 20:24:11 -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=jkA3g98h; 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 S1751824AbeCTDYH (ORCPT + 1 other); Mon, 19 Mar 2018 23:24:07 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:46642 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751681AbeCTDYC (ORCPT ); Mon, 19 Mar 2018 23:24:02 -0400 Received: by mail-pl0-f67.google.com with SMTP id f5-v6so168597plj.13 for ; Mon, 19 Mar 2018 20:24:02 -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=0NctSLm3CC7xB0HsHT7mIZUNySDi3TmOd5s8pz5e+So=; b=jkA3g98hX5vdT7iqN34UsvjqCzFdllpEsC6kogcgb/zizA7fZ8xFiT422yztdwjbFv HCn7UhSDsRijCi5B1TuCKuOe47nUO0rRfWNUMxO411bjkgNszD6WzhqVapTCoa4WGfaT 6bQzh+3iyc47CB6bx43JXuVHJ6wW/svjQ/xZM= 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=0NctSLm3CC7xB0HsHT7mIZUNySDi3TmOd5s8pz5e+So=; b=lKzj1skOHfVXm/RQu0z9Sl6qiO/S4K5AJCrVKTiXsCcOjpVnX4eDXqum3njAisezPd YqlPprWTWPP6+BwWpzNdtlcAD0FVk+ArbaCK6HrqIFUvpvykLCslzn4cnt5aUg5P8KQp OBBy1B/VTGcK5cW/lh3jznk+S41J4voD8qi2V9tsMUAYw3MnjbAZDlZftowcBaagVOkk Fb2JFdgxQTn+pvqfSbUnmY2iWEwXNMNbjL39u1VfFadWyZpsB6nrMRp6GucnHbD0fC6A COOwgrRFCBeV7+6k3RN7VVhIse8ErhAwB3IgJT9PaVhj7Ssvcd0TXQhkmzq4pcyHJdV8 2RGw== X-Gm-Message-State: AElRT7E3/ZK7qBa+9bhkB6Ghc3+vwNaIgLr+ujiyD1QRm/oOj1Ptestc lw7YD+FEzeRIWZ7GN8EFx1HrHA== X-Received: by 2002:a17:902:6ec5:: with SMTP id l5-v6mr14795300pln.113.1521516241700; Mon, 19 Mar 2018 20:24:01 -0700 (PDT) Received: from localhost.localdomain ([218.255.99.6]) by smtp.gmail.com with ESMTPSA id c14sm741286pfn.185.2018.03.19.20.23.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Mar 2018 20:24:01 -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 v5 1/3] arm64: dts: apq8096-db820c: enable bluetooth node Date: Tue, 20 Mar 2018 04:23:29 +0100 Message-Id: <20180320032331.29865-2-thierry.escande@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180320032331.29865-1-thierry.escande@linaro.org> References: <20180320032331.29865-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 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 --- 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 | 14 +++++++++ .../boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi | 17 +++++++++++ arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 33 ++++++++++++++++++++++ arch/arm64/boot/dts/qcom/msm8996.dtsi | 10 +++++++ 4 files changed, 74 insertions(+) -- 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/arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi index 24552f19b3fa..172165d84669 100644 --- a/arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi @@ -36,4 +36,18 @@ drive-strength = <2>; /* 2 MA */ }; }; + + blsp1_uart1_default: blsp1_uart1_default { + function = "blsp_uart2"; + pins = "gpio41", "gpio42", "gpio43", "gpio44"; + drive-strength = <16>; + bias-disable; + }; + + blsp1_uart1_sleep: blsp1_uart1_sleep { + function = "gpio"; + 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..f8d2a3b10b1f 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,23 @@ }; }; + divclk4_pin_a: divclk4 { + pins = "gpio18"; + function = "func2"; + + bias-disable; + power-source = ; + }; + + bt_en_pin_a: bt-en-active { + pins = "gpio19"; + function = "normal"; + + output-low; + power-source = ; + 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 Tue Mar 20 03:23: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: 132115 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp342489ljb; Mon, 19 Mar 2018 20:24:21 -0700 (PDT) X-Google-Smtp-Source: AG47ELuz0XzS2pewSfFHWsfzyDtMkpKQssW3cL0NGikErRzqCi/XY1k1Hj3e2hfdv9I4m2541rqP X-Received: by 10.98.95.70 with SMTP id t67mr6252894pfb.200.1521516261043; Mon, 19 Mar 2018 20:24:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521516261; cv=none; d=google.com; s=arc-20160816; b=ldH1PZ0DDCYo7pmGk/JT/1oQxfviqOIlNJloYctqvgsVVO33Vz1Y/5SyG5D4qAbH7J YX/ibayVyhflI+KEJnIyE6UADUYdvicq0KTotwFGrQTz2GR545NqgTauFjKjR1hLGmXK 4JT0Dpz7uA40F4ZI4aNTWZCwclYPyEx0n28E3tv+WT15WTYnF3+b2r7GFXDdpbNN0k3p +Bv7Ltp1veJ9cSdQ4wnsb35tn8FLwg6s1EBoS8E7xDMm1LeK+LKk+t665ItCxG0HbmLa mz502ALgZwWDjOaE050D2Vi4DSAHXHHzu48Xzyg1cQ00IzuCNVQXgpmIzhQTypWHve5U 2JCg== 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=hmvb7m8kLb9Qjay7gI7XQ47/XxJ0FoQji6P+BYmhXjY=; b=uG9LvDiDTO4kw+JZe8FVJiqs/UTENhoAXsVHHbOQzGPDuauflNalyrEKMD9LOqsHsa L3sVpgYR+chwyrAYfUIYKBDuQGULfDQvlvvMauJwyhSuCJA30KVo+m7top4NfFEG2bkg uei8c7qwFjMqwYr633QWPParLQBLK9bMcDUdxLhrAS1ygZxXt7GOOBeSmer5+SbNwtRw OzWJxiYYrRJG3sknJqjUsmWCz8O3S9y0Fr7XuyKAsksJtLnBh5zrRl6lGNEojIjGiOII 6Pjn2sGzDvnv2RM6EbO3vRPmefADkHrsg3pd5807IG4nQkH0sdcEXh4PpExTBC0hQIMy dxNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=SxOSI9YM; 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 l4si524601pgc.586.2018.03.19.20.24.20; Mon, 19 Mar 2018 20:24:21 -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=SxOSI9YM; 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 S1751450AbeCTDYU (ORCPT + 1 other); Mon, 19 Mar 2018 23:24:20 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:43754 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751837AbeCTDYK (ORCPT ); Mon, 19 Mar 2018 23:24:10 -0400 Received: by mail-pf0-f196.google.com with SMTP id j2so118213pff.10 for ; Mon, 19 Mar 2018 20:24:10 -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=sp7MnEk79VJgbeNKgDH7pX5kXv0w+e7jYJSPeoCE2XU=; b=SxOSI9YMQ4EQYcJDwT3Kb+ksVb6hOs5UlLvv7qi7IEafQm5LPyOKVYvThhodWFUGof UHxPKz5vjQoE4goezla5NjRX48hq6n+hHIYJ1bAfq/XyOq/CYoTeYh6hg4NVE8GVkhFe M3MHuGFoqbQ345AxO5NkSfA9K5du2fRt35ZDo= 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=sp7MnEk79VJgbeNKgDH7pX5kXv0w+e7jYJSPeoCE2XU=; b=XBxhho/6FdtugXXGieZi73zoLeCaQwGT5CYCpjoK16Rn6n3pneXRC27uU4Rh35XWQ6 FHNleDZHrNMit5IIw+xEpeqoheM9bdZpQT4rxuf4qDVDQn/DskivPpX8SEoI1KuCKklR xksY6ybsp1wGmjWXWEVZs7HJ9d40mVll9W92wRO0uV3DuVgGY7qZrRu2XBgBp3qb4Aiy N83pDnP42kizZ62ASR2XIa1fMXnAKBVzsF9PhCck8UMrwKWKabkm/j60+Fl7BrcA/S80 oGmejX9OltvroHG72F0pJGt/ycQgblRMzgm8JhmUk6n6YojeDH+fizT54rqRBWDCeyte AD3Q== X-Gm-Message-State: AElRT7Ed3BU4WGMz4bNiw27MFw5+bgE/ZKDJ5plvBFySZvshdifjpmSZ slWF6fjyy0kCtV49aro45AcToA== X-Received: by 10.101.96.205 with SMTP id r13mr1764455pgv.427.1521516249220; Mon, 19 Mar 2018 20:24:09 -0700 (PDT) Received: from localhost.localdomain ([218.255.99.6]) by smtp.gmail.com with ESMTPSA id c14sm741286pfn.185.2018.03.19.20.24.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Mar 2018 20:24:08 -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 v5 3/3] Bluetooth: hci_qca: Add serdev support Date: Tue, 20 Mar 2018 04:23:31 +0100 Message-Id: <20180320032331.29865-4-thierry.escande@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180320032331.29865-1-thierry.escande@linaro.org> References: <20180320032331.29865-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 --- 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 -- 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..6e6042f77784 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 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); }