From patchwork Sun Oct 16 17:29:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 3129 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1097935wrs; Sun, 16 Oct 2022 10:30:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6tBdhUlziZlvXARKn+70rI8sFiuK0z9XqCTOVIiEIsDcPvpmcT23rRkg/Skc1NfzzTLy6Q X-Received: by 2002:a05:6a00:1389:b0:566:1549:c5bc with SMTP id t9-20020a056a00138900b005661549c5bcmr8487457pfg.8.1665941455136; Sun, 16 Oct 2022 10:30:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665941455; cv=none; d=google.com; s=arc-20160816; b=UEjMEPf9OiT8N36IJc0SpgNG/S2ro5otY5LRDvfkEincaw+Mk0lWKBcXM5n67XWf37 QFkxrV3F4r71n06WapXP+4jM8E8dTpOxgGkwdxZvhjTlcpEK3lVEXRSkh+PJzwLDUdmj qDDGtRD0t1UmXj0sWJt1EJkvvHGpTurc+OscN0X17Xlz9kYXfo9880b+/E3KSrkz+6tp HFjWvMDyVgRFGXwmK4BohhrfJfpAJpt7SwMgUl+mdq0zqc4/55Jo0dTzwxWSbo6h6Yl7 hWHjrEZJh/qskea0oaJ709FVgDuz9fZrnO2tMqJ49E20cT8fGTZjw/JkOfHnNtXao4Gb TRQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version:reply-to :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=biK9SKRwYJsO1jq7QuCitwGwUZNgIZQWDcG6i8Ktt8Q=; b=0QUXe5gXtAUU9GF1tP3KJOVl13hgPBy6DAASfr755455E5/w/hmirq0p7NXCi2Socb 7tulocYxcHUuXoh5inoiQqdcFsM9pRvnGp7TrNZVjgA4T+lFBUD8+jQk157UHBJyrcWC UOEPzrcutlKu5guTZCOjbzahnCBYP+2PlEcLWOr4F+PzQJkmVYx77eReIfvrMFGovGfw ouGuVgxNW5ynPgW8oAEnW4+had8g2i+80j1cwA13tG5kFfkoflh1XHkaqghWtrIgYIe8 rLr1EtrtSXCKUbysnvmHow2dDSUtNZvkUVlPX66HCuF7si2ooBMjHTdwbDKjRi/6WuRb XL0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@postmarketos.org header.s=donut header.b="zmWI3/T7"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c65-20020a621c44000000b00562512ae9easi8730090pfc.159.2022.10.16.10.30.42; Sun, 16 Oct 2022 10:30:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@postmarketos.org header.s=donut header.b="zmWI3/T7"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229993AbiJPRaV (ORCPT + 99 others); Sun, 16 Oct 2022 13:30:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44348 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229803AbiJPRaQ (ORCPT ); Sun, 16 Oct 2022 13:30:16 -0400 Received: from proxmox1.postmarketos.org (proxmox1.postmarketos.org [213.239.216.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E9508240A9; Sun, 16 Oct 2022 10:30:15 -0700 (PDT) Received: from localhost.localdomain (cpc76482-cwma10-2-0-cust629.7-3.cable.virginm.net [86.14.22.118]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by proxmox1.postmarketos.org (Postfix) with ESMTPSA id 819381402B9; Sun, 16 Oct 2022 17:30:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=postmarketos.org; s=donut; t=1665941412; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=biK9SKRwYJsO1jq7QuCitwGwUZNgIZQWDcG6i8Ktt8Q=; b=zmWI3/T7/NCVm95YqsksbVCdkiMg9H2yLlvyJKghEcU4dW0P4Moq3o7ZpgkLrpsgvRz/tX CBIrJJtpnMMy4tWF8e231h+FDgRlSsRD0bv9ilPqgsqq//07tY9mH1IzePyu4QiPrABte6 LpHXzOaDpWrZCCpef/1gn13MDidn2zU= From: Caleb Connolly To: caleb@connolly.tech Cc: Dmitry Baryshkov , Andy Gross , Bjorn Andersson , devicetree@vger.kernel.org, Konrad Dybcio , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring Subject: [PATCH v2 1/3] arm64: dts: qcom: sdm845: commonize bluetooth UART pinmux Date: Sun, 16 Oct 2022 18:29:41 +0100 Message-Id: <20221016172944.1892206-2-kc@postmarketos.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221016172944.1892206-1-kc@postmarketos.org> References: <20221016172944.1892206-1-kc@postmarketos.org> Reply-To: Caleb Connolly MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746866227158691595?= X-GMAIL-MSGID: =?utf-8?q?1746866227158691595?= From: Caleb Connolly The 4-pin configuration for UART6 is used for all or almost all SDM845 devices with built in Bluetooth. Move the pinmux configuration to sdm845.dtsi in preparation to be removed from individual devices in future patches. Suggested-by: Dmitry Baryshkov Signed-off-by: Caleb Connolly Reviewed-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 37 +------------------ arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 25 +------------ .../boot/dts/qcom/sdm845-oneplus-common.dtsi | 28 +------------- .../boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 27 +------------- .../boot/dts/qcom/sdm845-xiaomi-polaris.dts | 27 +------------- arch/arm64/boot/dts/qcom/sdm845.dtsi | 22 +++++++++++ 6 files changed, 32 insertions(+), 134 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi index b5eb8f7eca1d..923d5d681daa 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi @@ -860,6 +860,8 @@ i2c_tunnel: i2c-tunnel { &uart6 { status = "okay"; + pinctrl-0 = <&qup_uart6_4pin>; + bluetooth: wcn3990-bt { compatible = "qcom,wcn3990-bt"; vddio-supply = <&src_pp1800_s4a>; @@ -1079,41 +1081,6 @@ pinconf { }; }; -&qup_uart6_default { - /* Change pinmux to all 4 pins since CTS and RTS are connected */ - pinmux { - pins = "gpio45", "gpio46", - "gpio47", "gpio48"; - }; - - pinconf-cts { - /* - * Configure a pull-down on 45 (CTS) to match the pull of - * the Bluetooth module. - */ - pins = "gpio45"; - bias-pull-down; - }; - - pinconf-rts-tx { - /* We'll drive 46 (RTS) and 47 (TX), so no pull */ - pins = "gpio46", "gpio47"; - drive-strength = <2>; - bias-disable; - }; - - pinconf-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"; diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts index c6e2c571b452..f87b1e2025b6 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts @@ -986,6 +986,8 @@ &uart3 { &uart6 { status = "okay"; + pinctrl-0 = <&qup_uart6_4pin>; + bluetooth { compatible = "qcom,wcn3990-bt"; @@ -1141,29 +1143,6 @@ pinconf { }; }; -&qup_uart6_default { - pinmux { - pins = "gpio45", "gpio46", "gpio47", "gpio48"; - function = "qup6"; - }; - - cts { - pins = "gpio45"; - bias-disable; - }; - - rts-tx { - pins = "gpio46", "gpio47"; - drive-strength = <2>; - bias-disable; - }; - - rx { - pins = "gpio48"; - bias-pull-up; - }; -}; - &qup_uart9_default { pinconf-tx { pins = "gpio4"; diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi index 392461c29e76..02ec0fa4e5f0 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi @@ -500,35 +500,11 @@ pinconf-rx { }; }; -/* - * Prevent garbage data on bluetooth UART lines - */ -&qup_uart6_default { - pinmux { - pins = "gpio45", "gpio46", "gpio47", "gpio48"; - function = "qup6"; - }; - - cts { - pins = "gpio45"; - bias-pull-down; - }; - - rts-tx { - pins = "gpio46", "gpio47"; - drive-strength = <2>; - bias-disable; - }; - - rx { - pins = "gpio48"; - bias-pull-up; - }; -}; - &uart6 { status = "okay"; + pinctrl-0 = <&qup_uart6_4pin>; + bluetooth { compatible = "qcom,wcn3990-bt"; diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts index 82c27f90d300..5dde27b7daf2 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts @@ -481,6 +481,8 @@ wcd_intr_default: wcd_intr_default { &uart6 { status = "okay"; + pinctrl-0 = <&qup_uart6_4pin>; + bluetooth { compatible = "qcom,wcn3990-bt"; @@ -567,28 +569,3 @@ &wifi { vdd-3.3-ch0-supply = <&vreg_l25a_3p3>; vdd-3.3-ch1-supply = <&vreg_l23a_3p3>; }; - -/* PINCTRL - additions to nodes defined in sdm845.dtsi */ - -&qup_uart6_default { - pinmux { - pins = "gpio45", "gpio46", "gpio47", "gpio48"; - function = "qup6"; - }; - - cts { - pins = "gpio45"; - bias-disable; - }; - - rts-tx { - pins = "gpio46", "gpio47"; - drive-strength = <2>; - bias-disable; - }; - - rx { - pins = "gpio48"; - bias-pull-up; - }; -}; diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts index 7747081b9887..c8b439dcbca4 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts @@ -639,6 +639,8 @@ wcd_intr_default: wcd-intr-default { &uart6 { status = "okay"; + pinctrl-0 = <&qup_uart6_4pin>; + bluetooth { compatible = "qcom,wcn3990-bt"; @@ -735,28 +737,3 @@ &wifi { qcom,snoc-host-cap-skip-quirk; status = "okay"; }; - -/* PINCTRL - additions to nodes defined in sdm845.dtsi */ - -&qup_uart6_default { - pinmux { - pins = "gpio45", "gpio46", "gpio47", "gpio48"; - function = "qup6"; - }; - - cts { - pins = "gpio45"; - bias-disable; - }; - - rts-tx { - pins = "gpio46", "gpio47"; - drive-strength = <2>; - bias-disable; - }; - - rx { - pins = "gpio48"; - bias-pull-up; - }; -}; diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index f0e286715d1b..55de40bea684 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -2971,6 +2971,28 @@ pinmux { }; }; + qup_uart6_4pin: qup-uart6-4pin-state { + + cts-pins { + pins = "gpio45"; + function = "qup6"; + bias-pull-down; + }; + + rts-tx-pins { + pins = "gpio46", "gpio47"; + function = "qup6"; + drive-strength = <2>; + bias-disable; + }; + + rx-pins { + pins = "gpio48"; + function = "qup6"; + bias-pull-up; + }; + }; + qup_uart7_default: qup-uart7-default { pinmux { pins = "gpio95", "gpio96"; From patchwork Sun Oct 16 17:29:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 3130 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1098045wrs; Sun, 16 Oct 2022 10:31:21 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6pVYMyIuXIFzV+poizgLB4IE1Y3P9Mm23E8rVN5lZSF55fSKGNze2Y/6z+7p63c8kUB4Ta X-Received: by 2002:a63:594b:0:b0:453:c041:7e with SMTP id j11-20020a63594b000000b00453c041007emr7248552pgm.87.1665941479713; Sun, 16 Oct 2022 10:31:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665941479; cv=none; d=google.com; s=arc-20160816; b=1JMbqJt0PTA5ArBCczWo5VzP09b7LO1243maImLFxtc/xj9F5pcuoNJ7unLWTwKehH Qj4NR9dj5ZxchgGO7ncQ3Z/ncYXTITOkuEITYjHwEu6x8/JCKfK+aFckBsg5qkJrCq2i PlnETEMedgmmVnTjhYWYhqC130QUCrv58JlpWU6SJpzIFJ7H5xXeH2CCW7wEH37eRAU3 fpgSIbyAZJH/mfxuVmZZMwUjVYO5hLUb4e8+hzKb/YmLuM61AnP+a+8w0o5nEW4G0SLi 6h4LENLfBthzyf4Lr/sLAaqWjTxYrGghOlgP9NDFY/1xfht3Ir6fGEPBO1oVQ0KYiOKu uFZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version:reply-to :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=WmAHFNIPG4R/4pg5dzKf5wTHE0K6fc3VSz40IAZ3aos=; b=oM8iGI6ykw3amoevtcsIG4U7kRH0GvZwmVfC0ElnsHR1lhFq2ATOvgF5EjZPWieAOO +DE0zV5oNPXxvQ72OVwzki+tU5Pb7efKqQCWmWB2y0JtbfA6mP1E2MEkHecclHYsZsCH QXyNUhc21VBceABOLrgWmWcNh2mwyso/K9gsuoLwz8PNJinMQ6fMBIW2+d53Ks+t8dRb 7xTfwyW+k8vO3z85F63e2k3IoGGRdhaPdiQGasO0QW2D01LHzMEsrQQwL1SzviMcBxO+ KxT9rX0Us9Ih6O/MmNzFEtPUaFNrMK0zKRnK4J4xl9J+xkS1YYYj+TCR5Byo4qYkGM/j MWSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@postmarketos.org header.s=donut header.b=JtfiFXJb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e14-20020a63d94e000000b0043873f43273si9361675pgj.375.2022.10.16.10.31.07; Sun, 16 Oct 2022 10:31:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@postmarketos.org header.s=donut header.b=JtfiFXJb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230006AbiJPRaY (ORCPT + 99 others); Sun, 16 Oct 2022 13:30:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44362 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229818AbiJPRaR (ORCPT ); Sun, 16 Oct 2022 13:30:17 -0400 Received: from proxmox1.postmarketos.org (proxmox1.postmarketos.org [213.239.216.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 90D3023EA0; Sun, 16 Oct 2022 10:30:16 -0700 (PDT) Received: from localhost.localdomain (cpc76482-cwma10-2-0-cust629.7-3.cable.virginm.net [86.14.22.118]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by proxmox1.postmarketos.org (Postfix) with ESMTPSA id 653D41402C7; Sun, 16 Oct 2022 17:30:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=postmarketos.org; s=donut; t=1665941414; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WmAHFNIPG4R/4pg5dzKf5wTHE0K6fc3VSz40IAZ3aos=; b=JtfiFXJbdAObywfWqWqIjMLBMs/u5TAxwC41ktdma2SZ1trRHyQJUKn7uUyTV4CUP0ADj0 nXE6GW+q4pV8j5ClPOONtv1C5Ui31jAwnYNWSTbanhch3BzFAVAid3DsyplIwgQexR+DNW A58WrTtsIKAIXkqFBc0P9kQS0EEyFa4= From: Caleb Connolly To: caleb@connolly.tech Cc: Dylan Van Assche , Andy Gross , Bjorn Andersson , devicetree@vger.kernel.org, Konrad Dybcio , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring Subject: [PATCH v2 2/3] arm64: dts: qcom: sdm845-shift-axolotl: fix Bluetooth Date: Sun, 16 Oct 2022 18:29:42 +0100 Message-Id: <20221016172944.1892206-3-kc@postmarketos.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221016172944.1892206-1-kc@postmarketos.org> References: <20221016172944.1892206-1-kc@postmarketos.org> Reply-To: Caleb Connolly MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746866252823026132?= X-GMAIL-MSGID: =?utf-8?q?1746866252823026132?= From: Dylan Van Assche Add serial1 alias, firmware name and use 4 pin UART pinmux. Signed-off-by: Dylan Van Assche Signed-off-by: Caleb Connolly --- arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts index 83261c9bb4f2..bb77ccfdc68c 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts @@ -23,6 +23,7 @@ / { aliases { display0 = &framebuffer0; serial0 = &uart9; + serial1 = &uart6; }; chosen { @@ -693,9 +694,17 @@ config { &uart6 { status = "okay"; + pinctrl-0 = <&qup_uart6_4pin>; + bluetooth { compatible = "qcom,wcn3990-bt"; + /* + * This path is relative to the qca/ + * subdir under lib/firmware. + */ + firmware-name = "axolotl/crnv21.bin"; + vddio-supply = <&vreg_s4a_1p8>; vddxo-supply = <&vreg_l7a_1p8>; vddrf-supply = <&vreg_l17a_1p3>; From patchwork Sun Oct 16 17:29:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 3131 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1098276wrs; Sun, 16 Oct 2022 10:32:06 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4BLkMQraY/EOh1NTjveGE7Fr8JBxRH2kmWKTMc0dGxxQyofD8TL9gkAmuBqBs/DXvzmd4a X-Received: by 2002:a63:454d:0:b0:43c:e834:ec0 with SMTP id u13-20020a63454d000000b0043ce8340ec0mr7532082pgk.270.1665941526061; Sun, 16 Oct 2022 10:32:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665941526; cv=none; d=google.com; s=arc-20160816; b=llkQcvhyf8gLSVvQKtdltDMkZf9xSKmSZCg90+1U1ODgr+Bxeu1jqEwz46BSPbQF6i tZNWg5ofHxM+lw6HqzIQnsxccAW+30vXVgyk/XMeDD6Qb+8/bNrdMoJz6OPqY88hyg33 MkTjizKKQwFsTWdwMXTBqhbTE485kEyENGo/cIeMfDvjdkgFc7zBNX7cjWNw9+h/n/zS PuvwUwQPaFU/qaHt8MbamdGNVprIQL+KjziUdE67A+ClW6yJ3bpqQK6M38XNpPCgrE6O mhQY9Pq3SznJHqBy7hTdO6YNhhTdhssPts+kBa54RtFeYLsuIUtV2wxyWUilb0sk9zqU MJyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version:reply-to :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=vLIoAuk5Ni3RxK9d6sJqHBNqJqsK4ckapijd/uqW65Q=; b=IeyYNoJFDgQVO46nhrsFkXU6j67Bv//L9trdLoIILFdHM9k+5W/57wuJCHH22k9A7H Vv6LZ5Pp+k9waIo3v5BM5q0asxvRpkK7iCOJbKk7suO7PTRGBcr0elr5eWecH1wwOoeh hiVPb5Qd2RvOODKUtZleB9IlVBkA1nmbzmL6kGOc85xtcdDlxtk/EVUNUS/F+bspvMFh 3hv07m3s/8zfw4QGBTAxigUnf7ZRoKK8MEkNgcJ//PFJXqLidY+yky16TvqeHm2+kVak Zx4EspiWpHIPNxCITrKDimp4PCkSlLnIkwSaW79D4dNhdiEmvGd6GYyhh99NacURqEBe W6zw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@postmarketos.org header.s=donut header.b=i8Ilo4hw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x26-20020a63485a000000b00439e6a52bb4si9349148pgk.620.2022.10.16.10.31.51; Sun, 16 Oct 2022 10:32:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@postmarketos.org header.s=donut header.b=i8Ilo4hw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229820AbiJPRa2 (ORCPT + 99 others); Sun, 16 Oct 2022 13:30:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229944AbiJPRaR (ORCPT ); Sun, 16 Oct 2022 13:30:17 -0400 Received: from proxmox1.postmarketos.org (proxmox1.postmarketos.org [213.239.216.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 1AEA12408D; Sun, 16 Oct 2022 10:30:17 -0700 (PDT) Received: from localhost.localdomain (cpc76482-cwma10-2-0-cust629.7-3.cable.virginm.net [86.14.22.118]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by proxmox1.postmarketos.org (Postfix) with ESMTPSA id 1A3D01402C8; Sun, 16 Oct 2022 17:30:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=postmarketos.org; s=donut; t=1665941416; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vLIoAuk5Ni3RxK9d6sJqHBNqJqsK4ckapijd/uqW65Q=; b=i8Ilo4hwcW4IvTuYvbiwaJs+IWdrZvzWjjiuMzCfZbLHGiZd+GHB6TU78gyTKaQbRq0S7B 1bonmIoYKPNvqiHWPBLTJ9d4J2ltbA1GxmZLy9vGDERkYBPRJvo6BwlBZrj/AGygusz+mz K4ju3uF805qTcGMQ82UJ166a9NtHC34= From: Caleb Connolly To: caleb@connolly.tech Cc: Andy Gross , Bjorn Andersson , devicetree@vger.kernel.org, Konrad Dybcio , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring Subject: [PATCH v2 3/3] arm64: dts: qcom: sdm845-*: fix uart6 aliases Date: Sun, 16 Oct 2022 18:29:43 +0100 Message-Id: <20221016172944.1892206-4-kc@postmarketos.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221016172944.1892206-1-kc@postmarketos.org> References: <20221016172944.1892206-1-kc@postmarketos.org> Reply-To: Caleb Connolly MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746866301787361515?= X-GMAIL-MSGID: =?utf-8?q?1746866301787361515?= From: Caleb Connolly Some devices have been using hsuart0 as an alias for the bluetooth UART, rename this to serial1 Signed-off-by: Caleb Connolly --- arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 2 +- arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 2 +- arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 2 +- arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi index 923d5d681daa..a8ae6de51af4 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi @@ -16,7 +16,7 @@ / { aliases { bluetooth0 = &bluetooth; - hsuart0 = &uart6; + serial1 = &uart6; serial0 = &uart9; wifi0 = &wifi; }; diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts index f87b1e2025b6..215dd8098a44 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts @@ -22,7 +22,7 @@ / { aliases { serial0 = &uart9; - hsuart0 = &uart6; + serial1 = &uart6; }; chosen { diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi index 02ec0fa4e5f0..5d99908d4628 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi @@ -19,7 +19,7 @@ / { aliases { serial0 = &uart9; - hsuart0 = &uart6; + serial1 = &uart6; }; chosen { diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts index 5dde27b7daf2..1646db2328d4 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts @@ -35,7 +35,7 @@ / { qcom,msm-id = <321 0x20001>; aliases { - hsuart0 = &uart6; + serial1 = &uart6; }; gpio-keys {