From patchwork Thu Mar 29 19:15:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Escande X-Patchwork-Id: 132573 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp2139994ljb; Thu, 29 Mar 2018 12:15:58 -0700 (PDT) X-Google-Smtp-Source: AIpwx49fhlwX/iigV4OwpbyJNmvHNzaPRHfyEAjaOj1X9Kgc4yuw+fLxdVwY+6xlG+u9JwccCPxS X-Received: by 2002:a17:902:7201:: with SMTP id ba1-v6mr9806549plb.0.1522350957929; Thu, 29 Mar 2018 12:15:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522350957; cv=none; d=google.com; s=arc-20160816; b=eDOT64ALNa3ZR8LA6JBxMJseu1V8i96VJZucTDkVVGwustKC7mckdMwCKNm1Rx24hG 7PpZgToYud5bnS2wrkDG+IB+IxvCdin4vGTIQsY7+UghoafUNirDwCjvJF5KIKU461IY 0a3tvssfe8ExswWXrLonSDaMKcHisG0o8d/1MLWuSAUHuwVcIYAgPCekcA96B+kFQ4Ic +a4Ex7NC4DaKmszZX8PDSVF0zs6XkEE90TjNbA2zo6heZ2f96jyXllTiDKhscq/Pm2JS ow2UceHdK3vS8/ASXM3eI1TA5E/juG7bVe5yLYubMzy8VV+Hx7CPbxzbRYFpI+16hdYu gxVA== 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=oAcronmriBongbqqiuUihelb4MGGr3MzD+XuyaCGa90=; b=mIoekeDwMACbUVCMuiKBVX6LMSOqvGTsMw8JeUN86sKaQa77ODWIIyx+mJVuaBQaLo Kh+Swzun+UWejmIaiOmLFCJRS19U4E1n934YwF+kuUoooGG2OtfQRSdiwW12WXwbNjss psWrU7lHfW9V5YgZukaUuPNQgmMjOanoUj6oTsEE5zuOGteP2CFmgY8fVFKz6051IxTA 1y2E77QtL9KvVe/3i5NyFNhZYTm7+ChNZzTdd/w11the1C/TmF0bx6RgFWJJAMPoVE9y EJOap24dv0mBazSG9sYoirDfFAEfRvZND3UMWUJsJrNYBLCYtArOEZ9iTTTZhpSR1cCR dyyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=K65TGKgK; 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 p13-v6si6639910pll.416.2018.03.29.12.15.57; Thu, 29 Mar 2018 12:15:57 -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=K65TGKgK; 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 S1752166AbeC2TPy (ORCPT + 29 others); Thu, 29 Mar 2018 15:15:54 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:46411 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751932AbeC2TPu (ORCPT ); Thu, 29 Mar 2018 15:15:50 -0400 Received: by mail-wr0-f193.google.com with SMTP id d1so6309630wrj.13 for ; Thu, 29 Mar 2018 12:15:50 -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=oAcronmriBongbqqiuUihelb4MGGr3MzD+XuyaCGa90=; b=K65TGKgK5xRyCsp52A4DIYMpRA2U5jQmqQ9pvXAea6kOEWOzaT5aYRc4woAITobXd6 DyAihh8oifwWgGCJuBIFnVaIbinEQcCGucImhO3bXE914Ty73NQaHCoY3rvuvCGCypqF Kmab8OhOWisNH9mx94WNSduxjPkehkCMM6IhA= 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=oAcronmriBongbqqiuUihelb4MGGr3MzD+XuyaCGa90=; b=PwXIGayzFLtnfWGTyrhbWVWqPpfwx/UM+8Z7mSlxtEFGiH1EXd+TB1UeVKB3oSKjfb YtbZDminYgLorTeAXhc7MSmn6/6tZQQyvPLPdCc52JhA9fQONLQqO14fV9pRJzCSCE71 zCbpI5YL2WAe1V08hJ0RQJISfQoDh984ZcUq4BYpUbtkam9FhHr2v26V0lJsYX5KaXvM qhaY0wq9UPvvVbOlfhdkG6BdiktN6TtWLaY7ArZyI8AL5d/u64xudHUYrAd0y3VK73+U +i+/2995F8wYOahOGP7rQ2b4n/qa5trG3PA2bJz0dpk/k8aHyTP8jLg0gQ/KENE2jwrW +uCA== X-Gm-Message-State: AElRT7FDx9U1AIy4Uaa3yJyw5lbmtfwzC0BCLpe1BEYhH83KFoo2WGLd 2nYISvdhzsbBD5a74zb1hLrYHg== X-Received: by 10.223.159.79 with SMTP id f15mr7741564wrg.115.1522350949290; Thu, 29 Mar 2018 12:15:49 -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 b40sm16145099wrb.88.2018.03.29.12.15.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Mar 2018 12:15:48 -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 v7 2/4] arm64: dts: apq8096-db820c: enable bluetooth node Date: Thu, 29 Mar 2018 21:15:22 +0200 Message-Id: <20180329191524.30225-3-thierry.escande@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180329191524.30225-1-thierry.escande@linaro.org> References: <20180329191524.30225-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 --- v7: - Remove bt-en-active node declared in previous patch 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 | 10 ++++++++ arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 30 ++++++++++++++++++++++ arch/arm64/boot/dts/qcom/msm8996.dtsi | 10 ++++++++ 4 files changed, 76 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 5d50f45c4df7..6167af955659 100644 --- a/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi @@ -48,6 +48,16 @@ }; }; + divclk4_pin_a: divclk4 { + pinconf { + pins = "gpio18"; + function = PMIC_GPIO_FUNC_FUNC2; + + bias-disable; + power-source = ; + }; + }; + 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 ec5e6eee0a7a..4b8bb026346e 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,36 @@ 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>; + + 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>;