From patchwork Sun Jan 20 06:39:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 10772303 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E164E13B4 for ; Sun, 20 Jan 2019 06:40:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D15072A74D for ; Sun, 20 Jan 2019 06:40:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C553F2A75C; Sun, 20 Jan 2019 06:40:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C4F82A74D for ; Sun, 20 Jan 2019 06:40:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726772AbfATGjj (ORCPT ); Sun, 20 Jan 2019 01:39:39 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:45028 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726473AbfATGjj (ORCPT ); Sun, 20 Jan 2019 01:39:39 -0500 Received: by mail-pf1-f196.google.com with SMTP id u6so8622932pfh.11 for ; Sat, 19 Jan 2019 22:39:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=OQfVRzCzHA4WSBdCjgd+0IRJW2iisS/CcO4MaoQg3i8=; b=Dv7Typ/HYxrw8biRC7OXQmZR+uTVsJTxceUWyO8L1hwuy7r+L9EAYUj9Wuzp1fqsxi 53ckfNfQmZeeEquWV0kGayPzQnuf7kOZtaGIx+fH21wFNy65KaVPVnrpqVJtvW6yMNVS sWuNXLStR1uhvJtAoxZlaWq/qlJld5/hUquVM= 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; bh=OQfVRzCzHA4WSBdCjgd+0IRJW2iisS/CcO4MaoQg3i8=; b=hmX4roLB9jK5IlZIFyL220woaOnFpzuAgBDDNlqBXc+VlbQmP6VoMINteoyU5pLgqJ Nj+60aV+Bk0IAcS5yWleFzN+n2/WFiPwQzw8ILbyZ642i+6mWOuGzhjfp32m3vQHruuM 3JyL2eDUQ64fILkHO+pbUx9533pn5dE7LOrizuypZjaP2PTYu705fcOB+gZi15ggaW2a G75QFoIVBOF0DPKFTHl39Yf/RFFh35letZr5s9EK/39uyWILiqnNnMDdizIB+ZWYdRJX 4596LxaGbnJTCZI90CauL+iuqhQLEEhxWPp/T9WNegUP3EBVb/MgRPYB9lN3/n7Kt5NO CqaA== X-Gm-Message-State: AJcUukdUgZLQ7B5DRAMlYvoweQYFtAWa+IaHaHnrSASh1CcasfZe2hYH BpYi9BXmxegqjwvo529N/MrQ/7sBHp0= X-Google-Smtp-Source: ALg8bN4Jcd0kJf1puf97Qz7E/At0O6dWiQ9dMqH6grrZb1jfoPDDP/JZHL8Cg3pCR+AQU/3UjeWksQ== X-Received: by 2002:a63:f811:: with SMTP id n17mr24331927pgh.23.1547966377877; Sat, 19 Jan 2019 22:39:37 -0800 (PST) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id x12sm8836776pgr.55.2019.01.19.22.39.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Jan 2019 22:39:37 -0800 (PST) From: Bjorn Andersson To: Andy Gross , David Brown , Rob Herring , Mark Rutland Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] arm64: dts: qcom: sdm845-mtp: Add WCN3990 BT node Date: Sat, 19 Jan 2019 22:39:02 -0800 Message-Id: <20190120063902.1714-1-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.18.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The SDM845 MTP has a WCN3990 Bluetooth chip on UART6, enable this. Pinconf and the associated comments are copied from a patch by Matthias Kaehlcke . Signed-off-by: Bjorn Andersson --- Changes since v1: - Fixed the pinconf arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 53 +++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts index af8c6a2445a2..5aec2c680033 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts @@ -17,6 +17,7 @@ aliases { serial0 = &uart9; + hsuart0 = &uart6; }; chosen { @@ -357,6 +358,10 @@ clock-frequency = <400000>; }; +&qupv3_id_0 { + status = "okay"; +}; + &qupv3_id_1 { status = "okay"; }; @@ -373,6 +378,20 @@ cd-gpios = <&tlmm 126 GPIO_ACTIVE_LOW>; }; +&uart6 { + status = "okay"; + + bluetooth { + compatible = "qcom,wcn3990-bt"; + + vddio-supply = <&vreg_s4a_1p8>; + vddxo-supply = <&vreg_l7a_1p8>; + vddrf-supply = <&vreg_l17a_1p3>; + vddch0-supply = <&vreg_l25a_3p3>; + max-speed = <3200000>; + }; +}; + &uart9 { status = "okay"; }; @@ -470,6 +489,40 @@ }; }; +&qup_uart6_default { + pinmux { + pins = "gpio45", "gpio46", "gpio47", "gpio48"; + function = "qup6"; + }; + + cts { + /* + * Configure a pull-down on 45 (CTS) to match the pull of + * the Bluetooth module. + */ + pins = "gpio45"; + bias-pull-down; + }; + + rts-tx { + /* We'll drive 46 (RTS) and 47 (TX), so no pull */ + pins = "gpio46", "gpio47"; + drive-strength = <2>; + bias-disable; + }; + + rx { + /* + * Configure a pull-up on 48 (RX). This is needed to avoid + * garbage data when the TX pin of the Bluetooth module is + * in tri-state (module powered off or not driving the + * signal yet). + */ + pins = "gpio48"; + bias-pull-up; + }; +}; + &qup_uart9_default { pinconf-tx { pins = "gpio4";