From patchwork Sun Oct 16 14:33:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 3022 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1041559wrs; Sun, 16 Oct 2022 07:36:01 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5OycbuJWBEIbJHqbdTFN+YwmEtErMO+R7OSZyucb1SYH/VrOUcMkiMrdH970dm5PO/i0/w X-Received: by 2002:a17:902:f681:b0:182:bd2c:26ee with SMTP id l1-20020a170902f68100b00182bd2c26eemr7333697plg.59.1665930960989; Sun, 16 Oct 2022 07:36:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665930960; cv=none; d=google.com; s=arc-20160816; b=QGzBhNsXjd92u0lck+7bz8Ez6cdauwWC5aOVuYbll0/elrme0U8VyWc3zw7lt9/k26 q30zLFXcvMJ/ElGeoaYyFX3mIAZR+VhpjnQHrWXBVCoJnIXC18JLcxALhTaMc1UizgLr u+xVsOvpi1puxareVJHbWOv8R8K1eC/zAD6tLPr3E5O72JlO1WM+DUuODMCfnlzfAUDj yJQriLovK9gxnggf6g9258kVW2OjhoNkhG0UTlmzXP16qX9rivAIWi9OeGtM+D0P/2dg nf2gXI7P6nmvypivm9aQ7gHz+DjMb2xfMshuIpo7XbWuCql1SXa1Q0ohkzNie62lUYBQ 8+sg== 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 :feedback-id:references:in-reply-to:message-id:subject:cc:from:to :dkim-signature:date; bh=WnxtVrYBr40QFa/agfVuW7lN496SFcxiF7zdspp9/LY=; b=HwCv2RDZeduAzuYydbpNQa5MdqLxeME4tRR/WjJkb0dJcM6TjBy/EerHtTb+30+byN NfTTUtfzp1tJuAFmo+KWraV0D4m3fUa+1It+CuBAY+qBUWhE52vXWtXaCVy1BFysi2Ky R3AnWCzQTk26SDXFCRv7yMrLO9flPUmIBinJdCLTodgG4x4x/KBVDmavYM7SkB6TGio2 8tR7B9g/HXBkFI3a+TRHLXV4pWLosBMyk+RIEeUzxR7kHFZTH4PuK1xn58RNia08onvG EC8nA0Kse9wTbB8e8LEIT3DsS92g366Dd3TsVO1iWiezpTf36kDcSPh8yOUsaE96c253 8rJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@connolly.tech header.s=protonmail header.b=PflAHFt2; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=connolly.tech Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q192-20020a632ac9000000b0046af2452ed8si8185165pgq.766.2022.10.16.07.35.48; Sun, 16 Oct 2022 07:36:00 -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=@connolly.tech header.s=protonmail header.b=PflAHFt2; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=connolly.tech Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229737AbiJPOdr (ORCPT + 99 others); Sun, 16 Oct 2022 10:33:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229789AbiJPOdq (ORCPT ); Sun, 16 Oct 2022 10:33:46 -0400 Received: from mail-4317.proton.ch (mail-4317.proton.ch [185.70.43.17]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1725D31FB9; Sun, 16 Oct 2022 07:33:46 -0700 (PDT) Date: Sun, 16 Oct 2022 14:33:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=connolly.tech; s=protonmail; t=1665930824; x=1666190024; bh=WnxtVrYBr40QFa/agfVuW7lN496SFcxiF7zdspp9/LY=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID; b=PflAHFt2bdd3iQms26MO3YsiI0fVkHv3f9Ius6HbxbVvIPtGHiidwGfP7tplXnnYN 7Z7DYt85V5zPhYaxSkTZXHfawQpu/oieWf+GgX+FQgwLJF6uTQpicbyizaenWz5+ET tTaUpquiICQNVOvUy0S7b6MElxobj0OX9Y4wIZis= To: caleb@connolly.tech From: Caleb Connolly 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 1/7] arm64: dts: qcom: sdm845: commonize bluetooth UART pinmux Message-ID: <20221016143300.1738550-2-caleb@connolly.tech> In-Reply-To: <20221016143300.1738550-1-caleb@connolly.tech> References: <20221016143300.1738550-1-caleb@connolly.tech> Feedback-ID: 10753939:user:proton MIME-Version: 1.0 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, SPF_PASS,TO_EQ_FM_DIRECT_MX autolearn=no 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?1746855223573512026?= X-GMAIL-MSGID: =?utf-8?q?1746855223573512026?= 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(+) -- 2.38.0 diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/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 { }; }; + qup_uart6_4pin: qup-uart6-4pin { + 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; + }; + }; + qup_uart7_default: qup-uart7-default { pinmux { pins = "gpio95", "gpio96"; From patchwork Sun Oct 16 14:33:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 3023 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1041830wrs; Sun, 16 Oct 2022 07:36:57 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6gJXFD6/AFQ8HgGcLqQTz8YoJD7aPVHSit99dOGOnWHarpMKOv8GfckNYxN9qwqOlUsVRj X-Received: by 2002:a17:90b:3507:b0:20a:9d07:1656 with SMTP id ls7-20020a17090b350700b0020a9d071656mr8612299pjb.188.1665931016929; Sun, 16 Oct 2022 07:36:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665931016; cv=none; d=google.com; s=arc-20160816; b=ozBKf+HOFU+LVBbI4+Lme7VlTefoLvWjykVLt8UPoLsTiddUK5eawS5BcncU02jB+A rpgA7aSwtqyM1ekvgvHJWP6+0Qkh1xGrP6ZH+VmSa8nvGvbCymVQS12nNA9zvS/3Qohc HWJGx0jF8dX+n7zmzg3mqyHF9FrL4DlIYDq8Zi8FdQv29XeGCBIp/ne01GFJg4yb75if dkQEmccW+SY2QpkogoVqnGV6yE4/jzffZnxODiK4JQIdpvE9N+UwZEwn21kRrDLA8Um8 kvY4V++iR3b6Ujx4rFOg8Bd4nHBqGAiikq7TQUadAC/dKM9SLDgjoYyQb4VgkzDhotu4 rHJw== 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 :feedback-id:message-id:subject:cc:from:to:dkim-signature:date; bh=JEVAZQ0D4waNBxYHVoLfbrQUbmflsCHE5YKCwexm9CU=; b=OO9nDcWRhtjCT4CHsT/1bVdzbzX2UBQ8te1672/s4mhSY7uG2BI6NwQMEur2wgTnon ZfJlTgMby0ESJBCZeH5WCImqf0WzH/FxJzIZ7SMSF6hT+AQ13OFRYMrCyNJQ4Hg8F2l8 Aa+280i4dFbju2kQHrhUjsNmGHFsyFKs6sPiP14jwG8hdJ5vnhQgfiDP1yQcjIzAOhWt SBu3SfNVN68tJXmCO02IQvCMQgTnzxl0h1jcjXGZYo9NhMln4N/bfyV6TZf7m2wLOYZz 6vZyb8qOiiPY3bfISv3qOlX34KCwbbbvXJd1wTuAoN2ATT4dkt0OQvNB0k5THliPyEDb V6Nw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@connolly.tech header.s=protonmail header.b=qaesTPgT; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=connolly.tech Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z6-20020a056a00240600b00562b0b92756si10028271pfh.297.2022.10.16.07.36.43; Sun, 16 Oct 2022 07:36:56 -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=@connolly.tech header.s=protonmail header.b=qaesTPgT; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=connolly.tech Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229809AbiJPOeI (ORCPT + 99 others); Sun, 16 Oct 2022 10:34:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51696 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229798AbiJPOeG (ORCPT ); Sun, 16 Oct 2022 10:34:06 -0400 Received: from mail-4022.proton.ch (mail-4022.proton.ch [185.70.40.22]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B4F031FB9; Sun, 16 Oct 2022 07:34:05 -0700 (PDT) Date: Sun, 16 Oct 2022 14:33:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=connolly.tech; s=protonmail; t=1665930843; x=1666190043; bh=JEVAZQ0D4waNBxYHVoLfbrQUbmflsCHE5YKCwexm9CU=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=qaesTPgTHMxLXLJopiRzyYDQzhpja8TNn3HxjSHr4Fxxaq4Ym54RdH4r+YFNKh0I+ 9ofIy6atx4rezeMQulJxrgx3+ga+WKfpRJYIkewVWsYWcXVB1b5FEMjxJGIOlkG01r qI91+L27bGkzD3nf/shGJ+h+ztIzDyi7/lBMqBd8= To: caleb@connolly.tech From: Caleb Connolly 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 2/7] arm64: dts: qcom: sdm845-cheza: commonize uart6 pinconf Message-ID: <20221016143300.1738550-3-caleb@connolly.tech> Feedback-ID: 10753939:user:proton MIME-Version: 1.0 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, TO_EQ_FM_DIRECT_MX autolearn=no 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?1746855281837819048?= X-GMAIL-MSGID: =?utf-8?q?1746855281837819048?= 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(-) -- 2.38.0 diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi b/arch/arm64/boot/dts/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 = &bluetooth; - hsuart0 = &uart6; + serial1 = &uart6; serial0 = &uart9; wifi0 = &wifi; }; @@ -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"; From patchwork Sun Oct 16 14:34:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 3024 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1041930wrs; Sun, 16 Oct 2022 07:37:15 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5yTk19jyYmPzvOeP9pwplVlmm2hPOyFT6iGjwd2V/MyRkHfZAVWMaZ3Fqu5kVRCGGXqP+f X-Received: by 2002:a17:902:7e0e:b0:17f:8edd:5f00 with SMTP id b14-20020a1709027e0e00b0017f8edd5f00mr7432750plm.96.1665931034932; Sun, 16 Oct 2022 07:37:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665931034; cv=none; d=google.com; s=arc-20160816; b=ASHGgW/zWEX9HgLxiYs47wb1ZO9nGlkIy4lgXjpEtGjM3PiT15UTT9FvJ+iW9phrkz qd06Iiv7GgjpW1s0qxuvHQOTLaF0Tg3Rl1r0YfL+PG3Sv2X3HL2eMXsqrifPJyB7L1Yq AiCtj3Agy5mB9V+qLaBZUMv4y907+jgwQ8WE0/C+qIfQC0h41ol8/qPX3XB2gR8J1o78 15qnI9hBYnjhteamdN2P6tVfxN0PwIHdfFwQ8WHm6CGwWQu+aB5+gURvK3XVy1jotGCy HmGa5L4JPJ7VeUVpmBS3ObBfkozqPPxOGBegUyagyXsfuu+HQCXURqHMrj4f02kaFenq USsw== 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 :feedback-id:message-id:subject:cc:from:to:dkim-signature:date; bh=CSTPfSj1OAUNfmI5pgjMNDJRewudlbE5XQ/hVQybyc0=; b=jLoenh0OqTJ+uaFXWUufFvJd4OjPHZcq8i3EubsFArXAoSYRkbjk1mhiMWnV6fnjXR 7TGYT+GpPM5EM1iM8mwmyUwXvfSawzpEG42HI5zdTz6oceGWY0uLDwS9egLuGxR4Sl03 6f6qgT8dznFW0iLWwRWXuWazAiwZlSysWSVErg76coFOkpFj4lPTSEjOOOfzwAhzx67n 8A+4AJHtvEyQXcHbOEP+rkKQupROapWJSF3N/gpPmzqlz0eWplIysK2akNwLE3N6VNHK 3Dx9twYokTl4Lor1b1ESky+P72ZTzP6pWLlPrXGJfoMAIEW/4oB7UYD0Bk3mq2t8cS9V 5JYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@connolly.tech header.s=protonmail header.b=GvfDqmP5; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=connolly.tech Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i23-20020a63e917000000b00434cc1d3b6asi8863531pgh.68.2022.10.16.07.36.58; Sun, 16 Oct 2022 07:37:14 -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=@connolly.tech header.s=protonmail header.b=GvfDqmP5; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=connolly.tech Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229819AbiJPOeR (ORCPT + 99 others); Sun, 16 Oct 2022 10:34:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51942 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229818AbiJPOeO (ORCPT ); Sun, 16 Oct 2022 10:34:14 -0400 Received: from mail-4022.proton.ch (mail-4022.proton.ch [185.70.40.22]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B474C32BB2 for ; Sun, 16 Oct 2022 07:34:12 -0700 (PDT) Date: Sun, 16 Oct 2022 14:34:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=connolly.tech; s=protonmail; t=1665930850; x=1666190050; bh=CSTPfSj1OAUNfmI5pgjMNDJRewudlbE5XQ/hVQybyc0=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=GvfDqmP5ZzxRR7A9e7jN/c+CchAGpc10ZgcJuaXB+IE9JF0yJULVo0tX/9dyjgBxO BGRpydEsAotkOIMqlNOraNEMAkA2f1zCZTQBaKNIO4k6HHdoh4ASHYtqvuV+WDpsAL zd2zNAbRqt0obUh7MSg6sLAruz+0aEiIcH+fDxhM= To: caleb@connolly.tech From: Caleb Connolly 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 3/7] arm64: dts: qcom: sdm845-db845c: commonize uart6 pinconf Message-ID: <20221016143300.1738550-4-caleb@connolly.tech> Feedback-ID: 10753939:user:proton MIME-Version: 1.0 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, TO_EQ_FM_DIRECT_MX autolearn=no 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?1746855300926636841?= X-GMAIL-MSGID: =?utf-8?q?1746855300926636841?= 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(-) -- 2.38.0 diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/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 @@ / { aliases { serial0 = &uart9; - hsuart0 = &uart6; + serial1 = &uart6; }; chosen { @@ -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"; From patchwork Sun Oct 16 14:34:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 3026 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1042060wrs; Sun, 16 Oct 2022 07:37:37 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7u/JVBJp4qoQtZfUGvVCXTRIBzmbNrQGpw3+qS8jz1+40URgSijMyYHtzAdvU+oQ/PJrf1 X-Received: by 2002:a17:90a:d3cb:b0:20d:92d6:a047 with SMTP id d11-20020a17090ad3cb00b0020d92d6a047mr25682433pjw.155.1665931046729; Sun, 16 Oct 2022 07:37:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665931046; cv=none; d=google.com; s=arc-20160816; b=lrXTxCXrJTotTlEEAjfz8OCrr76Sg6IFPFr9Kwb8zJcL3vg/jmr4aY2lKFQ0hw+RNV tdClkk1XU2HvckmStySaQG830LfsTpZhYs2MpjYviQhUyfBdMmmBcnWatwv3HB/YfCcj bSyVhaiyHnTKes8XfdNWca+4y5iSPHjY8eWnpKNRqHaNuvnqCDNsoNL92qZn/n5uRTaW u4VjVJh3dl4QpVwFUh/8JwXJ3tTl6vAWddlqP4V419DNAmPv3+0L51rrBELK+p4UaJER nI6nhZ22jbylFBk6LoW8hLUYDVY8n1MN5OjD3JsYeUpRY7s1zx7RV6KiqCp5Ey3dZjUD kz/Q== 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 :feedback-id:message-id:subject:cc:from:to:dkim-signature:date; bh=fOCEUqTzrXFvKLyulfGNIl6TWBAPrPGAVzA0GPmNZp4=; b=jZexVacXtX1SnVDOq8lvIUvxQFV2pbP+N6kH17vDH0PPA5gTuUi2OLmwDgGW4CqKFm HgMHQtSEfPAIlNcGVWfTktBt+j86qJyWpgyrHBhNTg2gU6dbwpMNGmZxG1tpsAobJ9WU RsqRBFCuvBu1HrXO9sWDMMT+YZr2ioOPbfDQjU3O0nVw/GSn5PovzC61dP3LZs38mXlF RS4LUPlSrn3+tDWepUmogoR68DfxQGW6gIsP+a+hcrnUXb/pOVEgObCl2Vx0P/05NU1p CzrhCBjcChdK9ByI4IIhhA946PhlxTy31FJKrXZMC6kf5PuD+cH/BsQ0DCJQITzKBml3 8Z/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@connolly.tech header.s=protonmail header.b=jvg2Afnb; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=connolly.tech Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id oa2-20020a17090b1bc200b001fad0e954cesi9974958pjb.32.2022.10.16.07.37.13; Sun, 16 Oct 2022 07:37:26 -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=@connolly.tech header.s=protonmail header.b=jvg2Afnb; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=connolly.tech Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229824AbiJPOei (ORCPT + 99 others); Sun, 16 Oct 2022 10:34:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229811AbiJPOea (ORCPT ); Sun, 16 Oct 2022 10:34:30 -0400 Received: from mail-4323.proton.ch (mail-4323.proton.ch [185.70.43.23]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1EDE62BD5; Sun, 16 Oct 2022 07:34:27 -0700 (PDT) Date: Sun, 16 Oct 2022 14:34:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=connolly.tech; s=protonmail; t=1665930865; x=1666190065; bh=fOCEUqTzrXFvKLyulfGNIl6TWBAPrPGAVzA0GPmNZp4=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=jvg2Afnb7lNXtSHQRAvsjLjjFCSTWNbEuyL9FsM/iSEvhQgRG31i23j1NcHavuRXx tewtThbEftr3ReSjgGcjyge9WgswjI7hGMjIXESXZ3Dft2gNr1/MEHA5aolAEl2EOY V/y9uofWx5+XqQVsGojPP3ryaF9elOSPxN7jB/Vw= To: caleb@connolly.tech From: Caleb Connolly 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 4/7] arm64: dts: qcom: sdm845-oneplus-common: commonize uart6 pinconf Message-ID: <20221016143300.1738550-5-caleb@connolly.tech> Feedback-ID: 10753939:user:proton MIME-Version: 1.0 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, SPF_PASS,TO_EQ_FM_DIRECT_MX autolearn=no 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?1746855313059505504?= X-GMAIL-MSGID: =?utf-8?q?1746855313059505504?= 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(-) -- 2.38.0 diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/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 = &uart9; - hsuart0 = &uart6; + serial1 = &uart6; }; chosen { @@ -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"; From patchwork Sun Oct 16 14:34:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 3025 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1042018wrs; Sun, 16 Oct 2022 07:37:29 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6Go7bu+kiV5Uq0XlMQ+W6dq1N5vgToHf9d1ktk9nqKGiu9JhFwnAqia9+53Y4QxbqCvTB0 X-Received: by 2002:a17:90a:e7ce:b0:20a:cb3f:faf0 with SMTP id kb14-20020a17090ae7ce00b0020acb3ffaf0mr27722892pjb.148.1665931047903; Sun, 16 Oct 2022 07:37:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665931047; cv=none; d=google.com; s=arc-20160816; b=G7GzPOwffxg8hCeyznWMEMsm741tA0Pj1L679IA9OspYBcMfXmhMKSHbOzbO9ct7ng IeXkiULEObo2xlEA2gqc3Cnyc/S9UQWHoTTL/a5ubzHCkLvGqTLjMXyiVZoKFfOx1BQg 0PrNg+F94MSph9yeQ4+vgwM5Qk+zw43B0zMFm0s5enasscBihE5UGqdM+NB7KikUWwmW UsbyeRrkhflRdFRGhUHW99AdjpfpudX4PXuM7+RrkqyP83klfztbyEmGjpcItcfZGZwk rMGYLfwhLKWhzWU21zyIqiCo9O6sB8cYjLJDcbPc23mWvvogwGSEPjbaxySPonm/aEFF Ym5g== 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 :feedback-id:message-id:subject:cc:from:to:dkim-signature:date; bh=ZseDGcoe4OIAaVlHQjhD3IczOM2W29Cg0YZOAMrNt2U=; b=FYDQ3ZloRQitcgH8K0ZiWp9Wo0/7+xxUIALsRPcaXTif9vYjttGoRlGBys9Zxwu/8E JieDxy1iYiD62KSoGleu9wYpEgXkRm6nfhiQjKU3xPftWlRg4KWWy90axj5vWUxozcMD eLUoJ+95iGo/4B33T+Xin/Ry73H9Dmil7/xXQCVlzhwNqacSVtJgXDcxSEJHySnjvgid qiBeU4EPtLv/OgCRcxB8YDwj6kPyIYNQ7Ma3FA0iptmKoqJP39NWsN9qDDiZDB8t6R6M FnK5ui2sXgOSCwaEaWMVb6s2L+eRp9gmSmtZj6VtRDasMQCBWR+VaGjxuVPBOz3y+v4O 0+Og== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@connolly.tech header.s=protonmail header.b=W9mEDBfE; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=connolly.tech Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d30-20020a634f1e000000b0044fb27b64c7si9183202pgb.326.2022.10.16.07.37.12; Sun, 16 Oct 2022 07:37:27 -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=@connolly.tech header.s=protonmail header.b=W9mEDBfE; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=connolly.tech Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229815AbiJPOe4 (ORCPT + 99 others); Sun, 16 Oct 2022 10:34:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229845AbiJPOen (ORCPT ); Sun, 16 Oct 2022 10:34:43 -0400 Received: from mail-4018.proton.ch (mail-4018.proton.ch [185.70.40.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40D87FD0C for ; Sun, 16 Oct 2022 07:34:35 -0700 (PDT) Date: Sun, 16 Oct 2022 14:34:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=connolly.tech; s=protonmail; t=1665930873; x=1666190073; bh=ZseDGcoe4OIAaVlHQjhD3IczOM2W29Cg0YZOAMrNt2U=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=W9mEDBfEZuZtawNU2vQRfl78qSxztHlrNuh73JhAiAGuVgkO32Gzo75mZaYa7eFl4 sfFff9PGi20DvfchCUgmR09LGOj4Y3kfWAq6J+lkx5ffwByANq2KW+mhRoC7bA2MO8 OOSHpa3P0hbPHtE3k3uBtZh5C+MDC3zbSeifSvjQ= To: caleb@connolly.tech From: Caleb Connolly 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 5/7] arm64: dts: qcom: sdm845-xiaomi-beryllium: commonize uart6 pinconf Message-ID: <20221016143300.1738550-6-caleb@connolly.tech> Feedback-ID: 10753939:user:proton MIME-Version: 1.0 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, TO_EQ_FM_DIRECT_MX autolearn=no 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?1746855314350740428?= X-GMAIL-MSGID: =?utf-8?q?1746855314350740428?= 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(-) -- 2.38.0 diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts b/arch/arm64/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 = <321 0x20001>; aliases { - hsuart0 = &uart6; + serial1 = &uart6; }; gpio-keys { @@ -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; - }; -}; From patchwork Sun Oct 16 14:34: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: 3027 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1042175wrs; Sun, 16 Oct 2022 07:37:51 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6aCaPKyaYW1+uAQlrbNQ1sBa1NE4cDP3jbBXJJGxSaluvv/SLtAyhg+eQgF6dlyjP6cmyz X-Received: by 2002:a63:1308:0:b0:440:5517:c99d with SMTP id i8-20020a631308000000b004405517c99dmr6654555pgl.550.1665931071364; Sun, 16 Oct 2022 07:37:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665931071; cv=none; d=google.com; s=arc-20160816; b=WnGcTsYA5ROUAvD82d/SsNW/FYwUA6ZQ/RqgKIpleYWmDxXkLQcQ3m00Me6inWijEP Gj6swI2sZmMbQfUFjavRPhkT92SiLtC2ufhxezh0hxx+bv9mGYoJm7g8pAiuQnpYiJvD UEQ/pfruK7m2yxOWfCF3HeBW40pH0xKfO/QJ0RTl28rGiX1fEjPwC530Tw6HZ087nR3M 0DnVOtmMjCcRiMJ4Pmliw/f46WjnI7FtVuKKmVXF4DLORz5G8JyTPS9KLUptq5ug56xc mYMyhXbNA+fU8+rx5XA4HzZN1D5oxXbJ1NeISDBof7KO5sdozpAF4SV/+7Okg1N9c2An qWmQ== 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 :feedback-id:message-id:subject:cc:from:to:dkim-signature:date; bh=GMeupPgWWUPw0EJDTFY+bM7LAhXLvu31+otdHSQX2LA=; b=PV8u7fbax0waGsJCbGkNwrsETvG84xaeHYtw2hNxOQnP8V0HJgoEex6DJebJD7mnOq BIQIrIPs4a77mYSCM5B2h4p5xSpdg9kGSzocUFwZb09E8TuSHZjHQ5Nphczt97cN6/97 xQLWTOUssPSI5/XWfXNcJsqpsBeYj1HHIg4UAOh/KXXMj6l3PdCY1O1NpNnGpd/iI/uO OdSZ8YJwPhm9BmZc6xhykwLaELMwDGrr7/BRyiPxtKFG8njV2zeFexKD3iXXDTYS8rkQ 0/YcR5QECeLyswJLJNajQ8Uq5bFl4dsQsnh1Xc7TslBltlbnDFnDHDe2x5UsakimhdLQ MXWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@connolly.tech header.s=protonmail header.b=ITCkkYTj; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=connolly.tech Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s10-20020a170902ea0a00b0017eafc16b97si10674687plg.397.2022.10.16.07.37.38; Sun, 16 Oct 2022 07:37:51 -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=@connolly.tech header.s=protonmail header.b=ITCkkYTj; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=connolly.tech Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229867AbiJPOfD (ORCPT + 99 others); Sun, 16 Oct 2022 10:35:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229884AbiJPOex (ORCPT ); Sun, 16 Oct 2022 10:34:53 -0400 Received: from mail-4022.proton.ch (mail-4022.proton.ch [185.70.40.22]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C4B017883; Sun, 16 Oct 2022 07:34:50 -0700 (PDT) Date: Sun, 16 Oct 2022 14:34:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=connolly.tech; s=protonmail; t=1665930888; x=1666190088; bh=GMeupPgWWUPw0EJDTFY+bM7LAhXLvu31+otdHSQX2LA=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=ITCkkYTjzq9wMdiL6h3/5tCqzncywXVBxrcr8kOjPPCj1kAAubkbpMZS8AdeMSKRo mdp6Kjhr1gVKAMQSo8dqb2fxj73bqMcL458m4+domQBjee8ZNxzQKgdnjVf2WYJvfp lcfl7UJu/eplPZtjUYkEJeW0FdGFll8UtyCKHnfE= To: caleb@connolly.tech From: Caleb Connolly 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 6/7] arm64: dts: qcom: sdm845-xiaomi-polaris: commonize uart6 pinconf Message-ID: <20221016143300.1738550-7-caleb@connolly.tech> Feedback-ID: 10753939:user:proton MIME-Version: 1.0 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, TO_EQ_FM_DIRECT_MX autolearn=no 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?1746855338755034715?= X-GMAIL-MSGID: =?utf-8?q?1746855338755034715?= 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(-) -- 2.38.0 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; - }; -}; From patchwork Sun Oct 16 14:34:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 3028 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1042337wrs; Sun, 16 Oct 2022 07:38:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM61ld3IYFeY57PrbAYWQuu3GAYFu1CwudqzcmBoSgoXVwBlhoQzFJ1AYxbPK+0DGW3HRPq2 X-Received: by 2002:a63:5958:0:b0:457:523c:57b1 with SMTP id j24-20020a635958000000b00457523c57b1mr6735396pgm.145.1665931093009; Sun, 16 Oct 2022 07:38:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665931093; cv=none; d=google.com; s=arc-20160816; b=m4T1q8tQscxvqExgHLlrDot65mgg+nffdzX8cHQVRxkuaU91bxP8Ijcz0S/+MJFGxt 5kSODDNcxt6m6LNnDK5fciouqG7mX1uq338cFrMo30pMAzuLzgI08gBwDtb7SMVyfoHX QAvD43pBjO2lwlwkpXgPODhZqMF9nSpCF6SKVfp1QC57uxqFQdRy6jZx6aRf9imt1Vjq e6UGDIhUZgcr/v2igNnv7IrRseP05xpC0/AQKMHh9kB5s91fpmTXob+ufEE6HaFCdxzK wg0Ysp/rm3drIIO+K1v8/rvLgqafk9By/3gzeU1fify9f7lMzGEJ8svZlffrExhbEw/d +pHQ== 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 :feedback-id:message-id:subject:cc:from:to:dkim-signature:date; bh=SqCIFBMkKHUsYImTU6oEqN9NKkHFufrsS60FGxQHQ7I=; b=hQ3h7laD8Cpcas8/iep8NQmh7zyy7Gn2pQp9Y6dSK8iJLNSDnBawab0QLhe9E2klVq /SdQ+ytWatK3UwJHF53ChgD0Nmy5t3mYbuTm7TOzDBtaHFiQqKzezE6MTT0y3yCmENVB +RR0viC/6/CWVvs+i5uGlZjvlmJ5kAp6MPaPu312VqLNLkl19wU6hkbTQpaiFE/GpGXH W0nLRMrZnxIJPS8xV+NEGjGrTrSBGC5MZt/uIPr77Vp0qTCzP6rYUvDeGEp2ewIT/+Hv +Dl5+te+VJDKj6mAoH+rrGKbwHYKN62f5UkBeFysx0CIFq1cvd2EcV8bw4v/vAN6W6bs 2dOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@connolly.tech header.s=protonmail header.b=VAy1RVcc; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=connolly.tech Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n34-20020a17090a5aa500b00203917479dcsi13655315pji.107.2022.10.16.07.37.59; Sun, 16 Oct 2022 07:38:12 -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=@connolly.tech header.s=protonmail header.b=VAy1RVcc; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=connolly.tech Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229892AbiJPOfV (ORCPT + 99 others); Sun, 16 Oct 2022 10:35:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229872AbiJPOfO (ORCPT ); Sun, 16 Oct 2022 10:35:14 -0400 Received: from mail-4022.proton.ch (mail-4022.proton.ch [185.70.40.22]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BAE518B22; Sun, 16 Oct 2022 07:35:11 -0700 (PDT) Date: Sun, 16 Oct 2022 14:34:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=connolly.tech; s=protonmail; t=1665930909; x=1666190109; bh=SqCIFBMkKHUsYImTU6oEqN9NKkHFufrsS60FGxQHQ7I=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=VAy1RVcc8WKGNzoCSFD2gE1r05kzQaBJq2dW1GVTsM8hnBTob1GjTlFIp5Glv2e9+ XrY6meyuVIx2Cxj8AXnZHfwhmv/jGSyPQyeYW4jBssYlaN1lf/jmW6O+Ds9UnEFWjY kQnrFpbohz7ckv38KhL/qA+pSKUgle7iaPVRmRyc= To: caleb@connolly.tech From: Caleb Connolly 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: [PATCH 7/7] arm64: dts: qcom: sdm845-shift-axolotl: fix Bluetooth firmware loading Message-ID: <20221016143300.1738550-8-caleb@connolly.tech> Feedback-ID: 10753939:user:proton MIME-Version: 1.0 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, TO_EQ_FM_DIRECT_MX autolearn=no 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?1746855361970442820?= X-GMAIL-MSGID: =?utf-8?q?1746855361970442820?= 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(+) -- 2.38.0 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 @@ / { aliases { display0 = &framebuffer0; + serial1 = &uart6; serial0 = &uart9; }; @@ -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>;