From nobody Tue Apr 7 11:18:49 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04861C43219 for ; Sun, 16 Oct 2022 14:48:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229745AbiJPOsJ (ORCPT ); Sun, 16 Oct 2022 10:48:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229660AbiJPOsF (ORCPT ); Sun, 16 Oct 2022 10:48:05 -0400 Received: from proxmox1.postmarketos.org (proxmox1.postmarketos.org [213.239.216.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 881B42EF02; Sun, 16 Oct 2022 07:48:04 -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 3CAFF140236; Sun, 16 Oct 2022 14:48:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=postmarketos.org; s=donut; t=1665931682; h=from:from: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=qykf9cobLBLPVoVdRp46OEJmyRQZ5GGRqXYXF3AhMqQ=; b=c8kihdYuOdk+wvDvnRIOYzfEP/CE3sto28l9Tg2PdRQGotNs+L1vXsXBBpWALBBLZWnaGO kn7UecA9sqhpj3EDqtB+p70ydLJjL4G5iPfdIJIaSaHbGBHpxteJKPzwOBwoxItg+OLLtH 1Tfq917jRP9lLTFRgoJOckX2J/LP088= 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: [RESEND PATCH 1/7] arm64: dts: qcom: sdm845: commonize bluetooth UART pinmux Date: Sun, 16 Oct 2022 15:47:07 +0100 Message-Id: <20221016144714.1742824-2-kc@postmarketos.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221016144714.1742824-1-kc@postmarketos.org> References: <20221016144714.1742824-1-kc@postmarketos.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 --- arch/arm64/boot/dts/qcom/sdm845.dtsi | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qco= m/sdm845.dtsi index f0e286715d1b..8c69942b969b 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -2971,6 +2971,29 @@ pinmux { }; }; =20 + qup_uart6_4pin: qup-uart6-4pin { + pinmux { + pins =3D "gpio45", "gpio46", "gpio47", "gpio48"; + function =3D "qup6"; + }; + + cts { + pins =3D "gpio45"; + bias-pull-down; + }; + + rts-tx { + pins =3D "gpio46", "gpio47"; + drive-strength =3D <2>; + bias-disable; + }; + + rx { + pins =3D "gpio48"; + bias-pull-up; + }; + }; + qup_uart7_default: qup-uart7-default { pinmux { pins =3D "gpio95", "gpio96"; --=20 2.38.0 From nobody Tue Apr 7 11:18:49 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 34F7EC433FE for ; Sun, 16 Oct 2022 14:48:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229784AbiJPOsM (ORCPT ); Sun, 16 Oct 2022 10:48:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229661AbiJPOsG (ORCPT ); Sun, 16 Oct 2022 10:48:06 -0400 Received: from proxmox1.postmarketos.org (proxmox1.postmarketos.org [213.239.216.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id D6BF12AC62; Sun, 16 Oct 2022 07:48:05 -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 07EBA1402C7; Sun, 16 Oct 2022 14:48:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=postmarketos.org; s=donut; t=1665931684; h=from:from: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=Jo1uU7GEhjOukEJcgVyoGH+HR9H31RAu1BOcT7Z3Z+c=; b=OF8f2nrJsZ74uJefLJb7K7FPAJPsJNzrItFSdMGm35r8yFqfzR+7iOvR5aPi+sVfeuj89z pHE53vBOy4zJJHyITW9XbwhcxxZi/gSzUhoCl+XvlLfdzuPAXJIeIY3Y+6vUwPYBNUgXxC yhvvXFiHlowy0G9SGy/tbJZfzsXo2Bo= 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: [RESEND PATCH 2/7] arm64: dts: qcom: sdm845-cheza: commonize uart6 pinconf Date: Sun, 16 Oct 2022 15:47:08 +0100 Message-Id: <20221016144714.1742824-3-kc@postmarketos.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221016144714.1742824-1-kc@postmarketos.org> References: <20221016144714.1742824-1-kc@postmarketos.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Caleb Connolly Use the new qup_uart6_4pin configuration in sd845.dtsi and fix alias name. Signed-off-by: Caleb Connolly --- arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 39 ++-------------------- 1 file changed, 3 insertions(+), 36 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi b/arch/arm64/boot/d= ts/qcom/sdm845-cheza.dtsi index b5eb8f7eca1d..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 =3D &bluetooth; - hsuart0 =3D &uart6; + serial1 =3D &uart6; serial0 =3D &uart9; wifi0 =3D &wifi; }; @@ -860,6 +860,8 @@ i2c_tunnel: i2c-tunnel { &uart6 { status =3D "okay"; =20 + pinctrl-0 =3D <&qup_uart6_4pin>; + bluetooth: wcn3990-bt { compatible =3D "qcom,wcn3990-bt"; vddio-supply =3D <&src_pp1800_s4a>; @@ -1079,41 +1081,6 @@ pinconf { }; }; =20 -&qup_uart6_default { - /* Change pinmux to all 4 pins since CTS and RTS are connected */ - pinmux { - pins =3D "gpio45", "gpio46", - "gpio47", "gpio48"; - }; - - pinconf-cts { - /* - * Configure a pull-down on 45 (CTS) to match the pull of - * the Bluetooth module. - */ - pins =3D "gpio45"; - bias-pull-down; - }; - - pinconf-rts-tx { - /* We'll drive 46 (RTS) and 47 (TX), so no pull */ - pins =3D "gpio46", "gpio47"; - drive-strength =3D <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 =3D "gpio48"; - bias-pull-up; - }; -}; - &qup_uart9_default { pinconf-tx { pins =3D "gpio4"; --=20 2.38.0 From nobody Tue Apr 7 11:18:49 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0983C4332F for ; Sun, 16 Oct 2022 14:48:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229798AbiJPOsP (ORCPT ); Sun, 16 Oct 2022 10:48:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55292 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229727AbiJPOsI (ORCPT ); Sun, 16 Oct 2022 10:48:08 -0400 Received: from proxmox1.postmarketos.org (proxmox1.postmarketos.org [213.239.216.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 6F7EF3A4AF; Sun, 16 Oct 2022 07:48:07 -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 9BE701402C8; Sun, 16 Oct 2022 14:48:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=postmarketos.org; s=donut; t=1665931685; h=from:from: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=OsUxm6CEaVuj+BgqZX7URiU3wGDNmYuU4NpAyLkGQ9w=; b=Q6S8u+L+MnEoEwO68LLvZvmgharop6U5hgX1yEzyjHcJ72UlLnnxoO7W3Ivn1woXxblhg7 xHxPdkCqxsxz77f9L2+nESS5be38w6uzm7T/t7QpqHdaDqnmwanvJ3GzideEci6fAeYtYb FuP9z0b0w8htm5DYwzDENwVKRb8txeM= 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: [RESEND PATCH 3/7] arm64: dts: qcom: sdm845-db845c: commonize uart6 pinconf Date: Sun, 16 Oct 2022 15:47:09 +0100 Message-Id: <20221016144714.1742824-4-kc@postmarketos.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221016144714.1742824-1-kc@postmarketos.org> References: <20221016144714.1742824-1-kc@postmarketos.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Caleb Connolly Use the new qup_uart6_4pin configuration in sd845.dtsi and fix alias name. Signed-off-by: Caleb Connolly --- arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 27 +++------------------- 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/d= ts/qcom/sdm845-db845c.dts index c6e2c571b452..215dd8098a44 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts @@ -22,7 +22,7 @@ / { =20 aliases { serial0 =3D &uart9; - hsuart0 =3D &uart6; + serial1 =3D &uart6; }; =20 chosen { @@ -986,6 +986,8 @@ &uart3 { &uart6 { status =3D "okay"; =20 + pinctrl-0 =3D <&qup_uart6_4pin>; + bluetooth { compatible =3D "qcom,wcn3990-bt"; =20 @@ -1141,29 +1143,6 @@ pinconf { }; }; =20 -&qup_uart6_default { - pinmux { - pins =3D "gpio45", "gpio46", "gpio47", "gpio48"; - function =3D "qup6"; - }; - - cts { - pins =3D "gpio45"; - bias-disable; - }; - - rts-tx { - pins =3D "gpio46", "gpio47"; - drive-strength =3D <2>; - bias-disable; - }; - - rx { - pins =3D "gpio48"; - bias-pull-up; - }; -}; - &qup_uart9_default { pinconf-tx { pins =3D "gpio4"; --=20 2.38.0 From nobody Tue Apr 7 11:18:49 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 708B8C433FE for ; Sun, 16 Oct 2022 14:48:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229631AbiJPOsX (ORCPT ); Sun, 16 Oct 2022 10:48:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229800AbiJPOsS (ORCPT ); Sun, 16 Oct 2022 10:48:18 -0400 Received: from proxmox1.postmarketos.org (proxmox1.postmarketos.org [213.239.216.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 3DE573C16C; Sun, 16 Oct 2022 07:48:09 -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 49D501402C9; Sun, 16 Oct 2022 14:48:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=postmarketos.org; s=donut; t=1665931687; h=from:from: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=JMybwLMLlth99DWUE9yhG7qXyR2N9mR/hTWgjCOFWs8=; b=JnBz7UeTi8gPDABOMDauz6tUGd/qh5znUefQbgu+jLN2NRpPdP1EgEQhQBLhBpYVF3qTGP t8VG7PbR6z+phr8HrzXvIuScNAwNBE2GuRBhrAmewJbvB79Wu+lLqUDed8Y3ar47giiXdw PYGXm2bXybytVfmouYlVDpVuCddggm8= 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: [RESEND PATCH 4/7] arm64: dts: qcom: sdm845-oneplus-common: commonize uart6 pinconf Date: Sun, 16 Oct 2022 15:47:10 +0100 Message-Id: <20221016144714.1742824-5-kc@postmarketos.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221016144714.1742824-1-kc@postmarketos.org> References: <20221016144714.1742824-1-kc@postmarketos.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Caleb Connolly Use the new qup_uart6_4pin configuration in sd845.dtsi and fix alias name. Signed-off-by: Caleb Connolly --- .../boot/dts/qcom/sdm845-oneplus-common.dtsi | 30 ++----------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm= 64/boot/dts/qcom/sdm845-oneplus-common.dtsi index 392461c29e76..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 =3D &uart9; - hsuart0 =3D &uart6; + serial1 =3D &uart6; }; =20 chosen { @@ -500,35 +500,11 @@ pinconf-rx { }; }; =20 -/* - * Prevent garbage data on bluetooth UART lines - */ -&qup_uart6_default { - pinmux { - pins =3D "gpio45", "gpio46", "gpio47", "gpio48"; - function =3D "qup6"; - }; - - cts { - pins =3D "gpio45"; - bias-pull-down; - }; - - rts-tx { - pins =3D "gpio46", "gpio47"; - drive-strength =3D <2>; - bias-disable; - }; - - rx { - pins =3D "gpio48"; - bias-pull-up; - }; -}; - &uart6 { status =3D "okay"; =20 + pinctrl-0 =3D <&qup_uart6_4pin>; + bluetooth { compatible =3D "qcom,wcn3990-bt"; =20 --=20 2.38.0 From nobody Tue Apr 7 11:18:49 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 59C1AC433FE for ; Sun, 16 Oct 2022 14:48:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229837AbiJPOs0 (ORCPT ); Sun, 16 Oct 2022 10:48:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229802AbiJPOsT (ORCPT ); Sun, 16 Oct 2022 10:48:19 -0400 Received: from proxmox1.postmarketos.org (proxmox1.postmarketos.org [213.239.216.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 7A2723C8C0; Sun, 16 Oct 2022 07:48:09 -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 BA3871402CA; Sun, 16 Oct 2022 14:48:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=postmarketos.org; s=donut; t=1665931689; h=from:from: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=v4Dcgfs7tb87jF5kiMXTGRJf9D6ZKn+2WZ6hnvK634Q=; b=IzlnLThDTaT2YKIbc8mEhq8RzqbUFtlOXUAgaZTco5Xj2hsFOY2skV89+2FNVlH3+L8tNc YEBnOvOZRnKBu1Qcbb7b7Q6XThYYKHN6sf06X0fTIwQfJCm5zpOa/YucO2FjUfWJu8wQdq rvZxJmEYjYNeAJeVWXVgYjleQRqZ3Do= 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: [RESEND PATCH 5/7] arm64: dts: qcom: sdm845-xiaomi-beryllium: commonize uart6 pinconf Date: Sun, 16 Oct 2022 15:47:11 +0100 Message-Id: <20221016144714.1742824-6-kc@postmarketos.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221016144714.1742824-1-kc@postmarketos.org> References: <20221016144714.1742824-1-kc@postmarketos.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Caleb Connolly Use the new qup_uart6_4pin configuration in sd845.dtsi and fix alias name. Signed-off-by: Caleb Connolly --- .../boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 29 ++----------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts b/arch/ar= m64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts index 82c27f90d300..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 =3D <321 0x20001>; =20 aliases { - hsuart0 =3D &uart6; + serial1 =3D &uart6; }; =20 gpio-keys { @@ -481,6 +481,8 @@ wcd_intr_default: wcd_intr_default { &uart6 { status =3D "okay"; =20 + pinctrl-0 =3D <&qup_uart6_4pin>; + bluetooth { compatible =3D "qcom,wcn3990-bt"; =20 @@ -567,28 +569,3 @@ &wifi { vdd-3.3-ch0-supply =3D <&vreg_l25a_3p3>; vdd-3.3-ch1-supply =3D <&vreg_l23a_3p3>; }; - -/* PINCTRL - additions to nodes defined in sdm845.dtsi */ - -&qup_uart6_default { - pinmux { - pins =3D "gpio45", "gpio46", "gpio47", "gpio48"; - function =3D "qup6"; - }; - - cts { - pins =3D "gpio45"; - bias-disable; - }; - - rts-tx { - pins =3D "gpio46", "gpio47"; - drive-strength =3D <2>; - bias-disable; - }; - - rx { - pins =3D "gpio48"; - bias-pull-up; - }; -}; --=20 2.38.0 From nobody Tue Apr 7 11:18:49 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 432ECC4332F for ; Sun, 16 Oct 2022 14:48:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229889AbiJPOsc (ORCPT ); Sun, 16 Oct 2022 10:48:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229757AbiJPOsT (ORCPT ); Sun, 16 Oct 2022 10:48:19 -0400 Received: from proxmox1.postmarketos.org (proxmox1.postmarketos.org [213.239.216.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 1E4463AB14; Sun, 16 Oct 2022 07:48:11 -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 4E81C1402CB; Sun, 16 Oct 2022 14:48:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=postmarketos.org; s=donut; t=1665931690; h=from:from: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=UApboHemUHszoyIAoKTwREf/Yubwe9WI5bTVBqfQa30=; b=nrPJUZg0GvwY1qmjR9N8hll3rBRFMD/MpsH/3KKRHQmXPHcd+YYTcFn1Gq0x+kaL7FlU9J VivlB/epw4tCVCk/pkZcyzViWF7IskEAL9Tp/t7nZXHpjA3dNwMrRvoVd/sMeuy7Uq9y4Y iqBUJqNpNM45lRrhK0oOYll+m+mRqGk= 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: [RESEND PATCH 6/7] arm64: dts: qcom: sdm845-xiaomi-polaris: commonize uart6 pinconf Date: Sun, 16 Oct 2022 15:47:12 +0100 Message-Id: <20221016144714.1742824-7-kc@postmarketos.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221016144714.1742824-1-kc@postmarketos.org> References: <20221016144714.1742824-1-kc@postmarketos.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Caleb Connolly Use the new qup_uart6_4pin configuration in sd845.dtsi and fix alias name. Signed-off-by: Caleb Connolly --- .../boot/dts/qcom/sdm845-xiaomi-polaris.dts | 27 ++----------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm6= 4/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 =3D "okay"; =20 + pinctrl-0 =3D <&qup_uart6_4pin>; + bluetooth { compatible =3D "qcom,wcn3990-bt"; =20 @@ -735,28 +737,3 @@ &wifi { qcom,snoc-host-cap-skip-quirk; status =3D "okay"; }; - -/* PINCTRL - additions to nodes defined in sdm845.dtsi */ - -&qup_uart6_default { - pinmux { - pins =3D "gpio45", "gpio46", "gpio47", "gpio48"; - function =3D "qup6"; - }; - - cts { - pins =3D "gpio45"; - bias-disable; - }; - - rts-tx { - pins =3D "gpio46", "gpio47"; - drive-strength =3D <2>; - bias-disable; - }; - - rx { - pins =3D "gpio48"; - bias-pull-up; - }; -}; --=20 2.38.0 From nobody Tue Apr 7 11:18:49 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BD0ABC433FE for ; Sun, 16 Oct 2022 14:48:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229757AbiJPOsj (ORCPT ); Sun, 16 Oct 2022 10:48:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229727AbiJPOsU (ORCPT ); Sun, 16 Oct 2022 10:48:20 -0400 Received: from proxmox1.postmarketos.org (proxmox1.postmarketos.org [213.239.216.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id BA0703CBFE; Sun, 16 Oct 2022 07:48:13 -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 BCB931402CC; Sun, 16 Oct 2022 14:48:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=postmarketos.org; s=donut; t=1665931692; h=from:from: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=VEjDpMV9FqHd8EpFEvxdteRzPjno13eoyZu2+rp7hAQ=; b=XRdXyhrBCtVZeIVfJIWcgZZ6hpAAbgjk535vCf0OIFfot9Atyx+AxXABpoCFTmDmSSq9NE JiURUz+kbvtYt/pctVyB9QMhT2CPJkRYy7KMM7iCSMNDaG5ZzsU0fXEx611500yx6lX0ru lg1Ini4ra/J+VlaL7/kkF+Bp859Rnxk= From: Caleb Connolly To: caleb@connolly.tech Cc: Dylan Van Assche , Alexander Martinz , 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: [RESEND PATCH 7/7] arm64: dts: qcom: sdm845-shift-axolotl: fix Bluetooth firmware loading Date: Sun, 16 Oct 2022 15:47:13 +0100 Message-Id: <20221016144714.1742824-8-kc@postmarketos.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221016144714.1742824-1-kc@postmarketos.org> References: <20221016144714.1742824-1-kc@postmarketos.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Dylan Van Assche Add serial1 alias, firmware name and use 4 pin UART pinmux. Signed-off-by: Dylan Van Assche Tested-by: Alexander Martinz 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..3e038156af4f 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts @@ -22,6 +22,7 @@ / { =20 aliases { display0 =3D &framebuffer0; + serial1 =3D &uart6; serial0 =3D &uart9; }; =20 @@ -693,9 +694,17 @@ config { &uart6 { status =3D "okay"; =20 + pinctrl-0 =3D <&qup_uart6_4pin>; + bluetooth { compatible =3D "qcom,wcn3990-bt"; =20 + /* + * This path is relative to the qca/ + * subdir under lib/firmware. + */ + firmware-name =3D "axolotl/crnv21.bin"; + vddio-supply =3D <&vreg_s4a_1p8>; vddxo-supply =3D <&vreg_l7a_1p8>; vddrf-supply =3D <&vreg_l17a_1p3>; --=20 2.38.0