From patchwork Wed Mar 14 15:55:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Escande X-Patchwork-Id: 131649 Delivered-To: patch@linaro.org Received: by 10.46.89.16 with SMTP id n16csp2183680ljb; Wed, 14 Mar 2018 08:55:51 -0700 (PDT) X-Google-Smtp-Source: AG47ELt66PZrQeQmNptv8ow/ECvo1x0r1gDXGAKr0f+vZp33RgZWpl+Z7NxDn+P8GLkcqYnKQjab X-Received: by 10.99.97.130 with SMTP id v124mr4090132pgb.351.1521042951109; Wed, 14 Mar 2018 08:55:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521042951; cv=none; d=google.com; s=arc-20160816; b=APUOY7G567ElkxMaQbsUx6LnXCZhnV8gi49lxXd9/Pf52vHdT+DfwsqZonPervdfFS Yw/alQvAtJt5kQkWaQ5/EZpoABINBxtdpDLgvMNK2Gf9jWF91WVNbrjuD4Og+/zuu2nl /PryTuK0cvPMrcmbUL++r8v4IBfpxQsoDoAuq+y32WL9SAIRpoLhfVSb+SxcM5tc0vR/ ty2NMdPJ40EB40scXsIJ8P3vHnnoikwZqgGi/HjGcozLMCMc/1V252DqVvVt7Sy8Uw7K 8E8qMyO5bRO472VTVPI94hMYrMJZyJsSOKHYVJSpD2jRa5TYrjLXq/1QNcbqYXOYbPVx ZlfA== 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=L46oP1KMmbHrk2Og5D8n1OdiVWEQZ2sdX05C7XXi/zs=; b=wlRdUEDIhmTPdLIn1YSaGIsIQLjIClTi4hI0ecfPt2BAqdNtgu2Vvip+tPQsNoJU+t rNL9RVuqCw1CFm8mLYt4sjU4YWe9rZ4cFYgO7xtW1hpQAcby89mLknvKY+VgqjQSXheV tO6T7j929pmgJHL5GairnjPedK3Q0NzyWuUNIRY0ok5g4+YgVgvG8Uui7BWbBOTuzcsB 1ckoyPPBOa4gRAdRc5/ypoEoKG6E0+8PL4XrWB61Qq0YzSb74H6MgVWBvV+BrpyucyV6 18qX6r7pi7rzXoKarchaEyYlvprffneWKUvdZikm/GYl7JlJgRCdLdfh1XKmwf252jvk WS2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eBOUyGI5; 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 o6-v6si2120358pls.583.2018.03.14.08.55.50; Wed, 14 Mar 2018 08:55:51 -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=eBOUyGI5; 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 S1752632AbeCNPzq (ORCPT + 28 others); Wed, 14 Mar 2018 11:55:46 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:37542 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751279AbeCNPzk (ORCPT ); Wed, 14 Mar 2018 11:55:40 -0400 Received: by mail-wr0-f195.google.com with SMTP id z12so5301729wrg.4 for ; Wed, 14 Mar 2018 08:55:39 -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=L46oP1KMmbHrk2Og5D8n1OdiVWEQZ2sdX05C7XXi/zs=; b=eBOUyGI5kT8LPOU9GSn2pFxw78lEKbp47WsJno/3YK1aY9+K1uIP2WUtkVQ+DTZSXQ PMxiUH9xWh36WSPCQtP3K72MjTKzkVq99FI8B/Gi/lBsRy2UHepmiaqTbjlJ1fLAHgmq NoyTAq7Yaip4X4khoZUz4H6MAxSegMg9orGAs= 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=L46oP1KMmbHrk2Og5D8n1OdiVWEQZ2sdX05C7XXi/zs=; b=NlwlCxxUtZ9E0WlLxHo57jBH6IDD3mC3zRtcdoZR5AAoAecSnjSPXd9aUmR88G5qI5 cYnT9spwEjgouCSGhSemn2RaZhMqOKGsl/Kxvw8DqZy5DwYt4Zb6KR+jSopd3AoNkgw2 cYfxpWFq9bM9J6u3WLmzVH7XlZXr7gctIR2JGm3qj5XJ0R77dLxlhj6jMYM3jTnkgbMq tD4/Lkle2Brlzz8dS8NdEITPiCBClZ/V/5yPVe7Lptc+QP5odZEYmkTNsxkoomGX8D+n 7vnKxYbSbJV1S4lZQm0sOcn7byA3KF7Qlu/0J14C6KC7SmaekM/c7EB9eOnhjQtB5HfG eLGA== X-Gm-Message-State: AElRT7FFpbgBzmV/w65Rm2TOlGZ7/bIvuK4YiXglNT6mYkVOkzraAv6M 5npTpvNBZ/LwIFqBgBQ9q1xxHQ== X-Received: by 10.223.162.201 with SMTP id t9mr4341478wra.148.1521042938530; Wed, 14 Mar 2018 08:55:38 -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.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Mar 2018 08:55:37 -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 1/3] arm64: dts: apq8096-db820c: enable bluetooth node Date: Wed, 14 Mar 2018 16:55:12 +0100 Message-Id: <20180314155514.3374-2-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-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 --- 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 | 32 ++++++++++++++++++++++ arch/arm64/boot/dts/qcom/msm8996.dtsi | 10 +++++++ 4 files changed, 73 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..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..b05d6bc0b856 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,38 @@ 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-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>;