From patchwork Sun Oct 16 14:47:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 3035 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1046596wrs; Sun, 16 Oct 2022 07:49:29 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4aYolzpy8WfIE1q4Nzpn9H+aj2HI16dZhRimjjouO5AIjvxKsx0vDILUz8HWHgEm7FHb5x X-Received: by 2002:a05:6a00:b50:b0:566:917:e588 with SMTP id p16-20020a056a000b5000b005660917e588mr7939598pfo.2.1665931769607; Sun, 16 Oct 2022 07:49:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665931769; cv=none; d=google.com; s=arc-20160816; b=aQyG4mwPBTFi0KMYUmVAJzqwjXmdxy7iYR5PfJrkeduN1GGLf7kCExMXDe77bVP4PQ o5F6Nr1XGR+hkCp2lWtdoshGyDe9TV3UqCaYbcves50PURYunF3qE6jLtk4onj5fHlJl dgThvTNRwQLZMzMcnhwM07BfnA9AV0f/j2pRru3D2uctfgLRefEBDqTx7jfZMVMmqnbh hJ5N9L7rTxuKSK0D+8tMG1UGybF8WauIYFgBRIzDP2/bfIcP8QXbYDgciuen5P59Pe8D WNzxuOlT52is4Mw/ZJCpxs3a3YhkF3h1CgL5aA+A+gq/HCONMc0CBVrPVBaDADMKQfpE Sj1w== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=qykf9cobLBLPVoVdRp46OEJmyRQZ5GGRqXYXF3AhMqQ=; b=VkKKsIC07NruAgR7448QSjPfPhquP/Yu5UKtwPFzC5M2r8zMKdcEr5ZLhhT/V/gbsb XzK9+Cdu94GfzuOiuu0o7W0l1JqC05FLEn4pli6FxBJ9OY4HutRHPIF6w11zUevY5yow R71fhzyCtZcisdm01JqKePjbFPsF862E+7YJ+Hj8ZhwBGzY0DnoreBZIZl348ybl8dJN A5akVkCzWthJhXqqttIV0tV2ch6HdsSLxIHpYMMCxQGJYSbQReRCBmbhz07LH5HT+6bc 4mruuOCxGRdRbw61SgAKLTuBYlHuPxgL6/FLSgc85xRZ2NOB1bVhsQHVHPod6J1DKV8v dcMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@postmarketos.org header.s=donut header.b=c8kihdYu; 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 p4-20020a637f44000000b0046b3dce8455si410740pgn.14.2022.10.16.07.49.17; Sun, 16 Oct 2022 07:49:29 -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=c8kihdYu; 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 S229729AbiJPOsI (ORCPT + 99 others); Sun, 16 Oct 2022 10:48:08 -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 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?1746856071220732482?= X-GMAIL-MSGID: =?utf-8?q?1746856071220732482?= 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/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:47:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 3032 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1046457wrs; Sun, 16 Oct 2022 07:49:00 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5RJwHEu3MdjjzW2ToaVY8ZRBkmVQoszu/kX6pMfifUyC9j1MBTnhVznycltOPvMLApbegf X-Received: by 2002:a62:ee17:0:b0:55b:b0d:bc9f with SMTP id e23-20020a62ee17000000b0055b0b0dbc9fmr7808624pfi.39.1665931740075; Sun, 16 Oct 2022 07:49:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665931740; cv=none; d=google.com; s=arc-20160816; b=Py6hM9UoK2MJ1yOSLz5VhCrHJGli1dLugNf/DWqpB9McWNwksncjt+hRxbVL7aIuyh 9bSHUwxsLyiNYAWXbvm/WLr+VTrBIlZOBumYPmPLaHmFuCtu5phe0wrnaAdfFbxgD5BX zTyucBeq9PZMJ7lsd2kTINC/rkQruVN5Llk9qUJnhTn9tw+TFp3QzEwbbnqUh/51tESe +WUgRsm6UqZe8RnI9+xQQsvzS+8LYzSmoh+vshCVa6B9MiokVUoeIbYfwRIBQcpV1eky O+K+foLxQMb5Eh8hNr8Yt3/T1WOFpkA/lmVzg9kaAouIGFjY0cgazyzFkTlpf8lv69sV UVAg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Jo1uU7GEhjOukEJcgVyoGH+HR9H31RAu1BOcT7Z3Z+c=; b=r3gpX697BhxNvebI2/XIjceimmddHHjnmJM9Svx5vz7JIj71mbQZKCFfHfIGeDRqsr yCQuVV5GDmCEeN4+xa8DdcCrfApxU11XE1lbBeB0sPsMgAaOXipp/G1OmDP5cMGBrpRd t3iq0RzOvk6o5F89F6ESSnn9uGTi+SzAACCvkv1oqo8fWDlOdIlH94vRmVGbxv3NlqbV UqnFUzunU3ltflo9+q+w76H5LrJz007W3VcWToUgzJUEl2u9I+jkyxYAmO/SkBCmIjp1 QUoAf7A93VDb46bmhRHUGCi3YJiUh1omkczzRmpoifMqEcgAVzHLOUn5/JNdL9ez+K9y oovA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@postmarketos.org header.s=donut header.b=OF8f2nrJ; 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 l14-20020a170903120e00b001823a7b6c7esi10430061plh.585.2022.10.16.07.48.47; Sun, 16 Oct 2022 07:49: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=@postmarketos.org header.s=donut header.b=OF8f2nrJ; 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 S229782AbiJPOsL (ORCPT + 99 others); Sun, 16 Oct 2022 10:48:11 -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 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?1746856040216140733?= X-GMAIL-MSGID: =?utf-8?q?1746856040216140733?= 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/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:47:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 3033 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1046487wrs; Sun, 16 Oct 2022 07:49:07 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7sK0hw/Qg477ug8U4iFUR/OK0a1vgBit0YLxaBHi+Lu+HcOmwE5uIk5QdiCAM3uK4wx8NR X-Received: by 2002:a63:5a1b:0:b0:461:9934:6f62 with SMTP id o27-20020a635a1b000000b0046199346f62mr6847296pgb.266.1665931746769; Sun, 16 Oct 2022 07:49:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665931746; cv=none; d=google.com; s=arc-20160816; b=XHVtp01klKDtsHuxdM8LINy1DdDh5mMp/YjvMjRZdDf0q3dFK5pO6zVeWDU+2ZaxBj QLcOKVAW/O+/WuGykhbKUk9ONvUtO1XKIQaIT18hgKPsulVTjKjQ5KQ5nFUdy4R29zO6 gtkuOmdiWBI+R1FAs6Mnwc5kUA+A4kECHEvjkpVIXG1SKNVwjkxya1Ih9LWZkqOelWg6 zMfHh0XhRHAAhHlTxjbHln0T9S+VC5TRoY4Q45ULCfAfkNKdCzHJT1Lw/i6TZn8xcATL 9wKU+2+smeyvL3TrQwNwMmPcw//1LR7QPPcGXdp/CYonbMHUn0pvYLrLtAo88Rmxot91 6sgA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=OsUxm6CEaVuj+BgqZX7URiU3wGDNmYuU4NpAyLkGQ9w=; b=0x2xpe9uJAOpq0uRT53mlXozfEiwPLIH8bpmrAcbs4iezZsl30YJC5Uq63BxEaD7I7 gpG63EQS/J03oL88E9rTALGoFd2UKKcjNd00Ftq8LQhMSdmI1pnl2mfLapcHWcW0/7/F /EX2I2K6o5qcQ8gGU+N+hTtg1mAt0YfizuxZGrYaU4dqYsIvMMw/Sh02oc43jcmkmKxB z1wn5nMMZS8vHQ05fukfx5WzyMgk/MeZ1npVhWTffM0pUQkL7OJGja8gv4+BnDsmQLWJ zJ6BWs5zm6ZliPUzHFRsTYk9jJPNRK0sOnRzBP67Ww8FaVsbQa8Umkh5nr8IRPl9Nybc J2XQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@postmarketos.org header.s=donut header.b=Q6S8u+L+; 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 t41-20020a056a0013a900b0053abdfb0228si10201563pfg.338.2022.10.16.07.48.53; Sun, 16 Oct 2022 07:49: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=Q6S8u+L+; 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 S229792AbiJPOsN (ORCPT + 99 others); Sun, 16 Oct 2022 10:48:13 -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 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?1746856046998578232?= X-GMAIL-MSGID: =?utf-8?q?1746856046998578232?= 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/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:47:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 3034 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1046514wrs; Sun, 16 Oct 2022 07:49:16 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6SlHh1wbZNx/zcMdO4BQuNJiA8Ewl6ydohhw8/Uwq7Hf6tSphb8T8QKSl4s2b8sxQk1hcP X-Received: by 2002:a17:90b:1644:b0:20b:aa58:125c with SMTP id il4-20020a17090b164400b0020baa58125cmr8837117pjb.110.1665931755802; Sun, 16 Oct 2022 07:49:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665931755; cv=none; d=google.com; s=arc-20160816; b=BcAb8aoH9Iy+lK4Z/LIIk5RjYDzcoZOH1n3E0X+uTqrroKJPRYt2/4G5CaWhdQJfOw CWrJYOyu+cufsnuslIasWwkoh7LGbUIlhfO4apWlqR3IE5hhsGxGeLDooUU1yz3nKXW0 cRkL3sn4nheTsB8BqU273OBG2YQ+L3NxekClZ3/Il75OUyTmTR9xpdtFKctwItI3/zEH sKnfrjDZ/QOqfjd7gG8ebRZ43bfFg/S/MooYacU+MAmsL71LGsR7D5faM/jS19SIqAoa CCxLwgU6AKNs85fa5++gAeq9SuWH+vZduv2OQ0a+D3Pzg6LQDLUWOVZ9fi/qPjDzXG3F bbew== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=JMybwLMLlth99DWUE9yhG7qXyR2N9mR/hTWgjCOFWs8=; b=wWahsQqW4NtF/jBFPImMtUKqe05XXx9WZuxckLEtkbl9uCVN/iJU368Lbjarlcz6la Te0JtyLXrIqt0EG3q0LV0+tdNG/QtriYuLV+Mv+2Qpf/WOTjBmjyi6CiQQTX5Sy1I4vP HYkQ12iH1ofz8+u8wRU18fbzAEzeKlLvTdB07H0t+A+CWR9z2nJkYStEWZHWlVMergHl GzbmjQYSr94VrM5nmEnOJXYrtAfkqaCTYbq3+Rzme6zMRbHjnIJ2HPLZG/CS9Vv62Cgk RGLfPXUikQEd5d0uAmeqhbnK5he9WIZ0ANZbPtWGGp8VCW+V8yeeeL9qX+xJMlIkWaqX 4amA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@postmarketos.org header.s=donut header.b=JnBz7UeT; 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 r5-20020a63ce45000000b00451b094d74bsi8007391pgi.454.2022.10.16.07.49.02; Sun, 16 Oct 2022 07:49:15 -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=JnBz7UeT; 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 S229831AbiJPOsV (ORCPT + 99 others); Sun, 16 Oct 2022 10:48:21 -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 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?1746856056654986639?= X-GMAIL-MSGID: =?utf-8?q?1746856056654986639?= 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/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:47:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 3037 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1046734wrs; Sun, 16 Oct 2022 07:49:58 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7TFrUSIXXpubON0LJr3irZ8YbiJ3Er6DH1iU7VUdMgg0y46b4/eCnoRqXb+1/bINfIzG9+ X-Received: by 2002:a05:6a00:b85:b0:563:4623:ec40 with SMTP id g5-20020a056a000b8500b005634623ec40mr7633643pfj.56.1665931787014; Sun, 16 Oct 2022 07:49:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665931787; cv=none; d=google.com; s=arc-20160816; b=aYBGYYjdBRukVr6WFgo3Km9Ou3D7IPiDen0vWF1V3EyZg2r4IP0PT7mZNdOOBwG7/D HZjJ+WUX9KAK/pBcoDdBcK5QFwfBayuy4d+VgOYoGgP0TI6Wo+Ug9EXgpfljmIMK8vUP d/2dLtfkTTwxNKNKyeyKg2/cH5+93hjWe3AP1HnPn9fNoZzgEfejWeJj3ZI+clVpA8oP 2k7T6P3Jy7qzjESe0vuVK9SQkbmqRfeR3PeTDiXQuOWMqth+q8uMLxwtE1BDmoKBgGrQ x3DcZV/aok/pOrc/trgfyv/yFFZqvpqYQC5rnMTEG/vqvxsuUbpiLCDH3FgP5EhLNSkC gEKw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=v4Dcgfs7tb87jF5kiMXTGRJf9D6ZKn+2WZ6hnvK634Q=; b=UYloJ47UzUR9+yNGzmSsPLWMNyPnQbKzWgUtlqgImbksVSjLn9EOZjxFAUDnXP2W2R 8OYXyARbWIcaJkHDmqB4egsaA1ztGcHUPV0FwxXVRT0Gdtdc9KpFNIQjbF4AyAGZNj4R 9wkk6Z0vmosxgkCylMcs+l9G6432VG7EHhTNDR0gorPF8gJxotNX7cYxCBY373KTf8Z2 c+0QHHQ+EZczdlGZxWEna5pf/NWxLrjsaCOarvoMUpXSD8HBnpDCeMm3sgCTGYaIJ+br 0A5lDF2lrmRyVadASwBT4kP9TKeZ4X2oB8cwPUOuxnVvd4fAa7v7ftsfAAXZx6PaRgO1 yIMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@postmarketos.org header.s=donut header.b=IzlnLThD; 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 c4-20020a633504000000b0044a0b2e174asi9423397pga.83.2022.10.16.07.49.34; Sun, 16 Oct 2022 07:49:47 -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=IzlnLThD; 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 S229830AbiJPOsZ (ORCPT + 99 others); Sun, 16 Oct 2022 10:48:25 -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 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?1746856089686779054?= X-GMAIL-MSGID: =?utf-8?q?1746856089686779054?= 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/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:47:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 3036 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1046733wrs; Sun, 16 Oct 2022 07:49:56 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4gHa8a309AVB8h3k6CgDIWJwFEZFC4Q2nEGoIY35/JpLK58V1jEPHxp2Bq2kaOplyDs4Rz X-Received: by 2002:a63:8549:0:b0:461:47e9:30df with SMTP id u70-20020a638549000000b0046147e930dfmr6834733pgd.376.1665931796619; Sun, 16 Oct 2022 07:49:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665931796; cv=none; d=google.com; s=arc-20160816; b=nOv7RIWQM1BulxjE+ssMWExb9WYZw6Iab0fP+2+dKmFo1kpaBYQ/iJuJk+cHTbv09V YJQnRi/zd2LZbwBYoucdprTWHfNDPtzgO5XDed143NOfDYJlZuMm7HtBSbK+sBXLeVbU k9VCaAR8xSWRazufBy878bFRXZYYiQYAQQKTydNHsug1VDTTCAA3WlBGTyd31HerfApw 2/sIIi5tcmik5Hq692jiPX9h1I+KBeJiQNlkixxZM3m1KPLs0hMT/NIuPGQbAKCpPLAi Id7fg43PK5MVZ0eALjZtmWETI6m1ZzlVVVKqzku1ChTzP4pKoU1rXyN+f6uN3cxbgEMl nHYA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=UApboHemUHszoyIAoKTwREf/Yubwe9WI5bTVBqfQa30=; b=aFRV+YlBR1yXsaDk6nTQybaLJD5SieYBMlPcLRYIiT03LkheaOyCQmF+OAnXEikItH bmThKu2+L0TKVl2QcEmIfMjdFFMv5oUY5rTHa7Cha8KkhPJeBDh3Od0yzEXs/MNthyts kVuNwogjXiFXVH5Wf1B5ygHax7yJ9bM4L99trcPF3Tdli8b66LwBw4ymv7NDi8k1gwZN rak/sDoBRg1F8XinNY7SJyn6bvbgqloUtacn3HHp+56GQrHTsM8HMUbEdn/WolE2/qh3 KrtZcj3csosM0LBc51cAPdshKN+Xjjv7snQnjVSrHb1fQX41WJjxuuuuDfU3LwY7Y3ve vE9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@postmarketos.org header.s=donut header.b=nrPJUZg0; 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 j9-20020a170903024900b001769b63ec65si9542874plh.483.2022.10.16.07.49.44; Sun, 16 Oct 2022 07:49: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=@postmarketos.org header.s=donut header.b=nrPJUZg0; 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 S229882AbiJPOsa (ORCPT + 99 others); Sun, 16 Oct 2022 10:48:30 -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 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?1746856099596540689?= X-GMAIL-MSGID: =?utf-8?q?1746856099596540689?= 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/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:47: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: 3038 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1046851wrs; Sun, 16 Oct 2022 07:50:20 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6e4okdhQfiaC7VdI2LpzQQV2Gy8226WoBpaqi9nOepEynefu3d5QN8lRUwxlvg0W5wJC0y X-Received: by 2002:a17:902:f806:b0:184:4a8c:f91f with SMTP id ix6-20020a170902f80600b001844a8cf91fmr7411784plb.45.1665931820056; Sun, 16 Oct 2022 07:50:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665931820; cv=none; d=google.com; s=arc-20160816; b=gReJSHRHSElsECXDfkAsV+w7xXauv5x9mh3tBMdF3bUJdI/9hKy0/+ggFjo469jmFX BD5IAmyfbi/Hd7HLbtZwHGV265qkffgv4kgLQ7QkJ4ehDSb/vfXUVNt6D4DV1SnRDkwF cKz/yQgLA5Xj7HyW/uYbj4qOl9YJyLrJOT0andVEhwIvkXrOFy9sZXie4RgOp80C/yn/ teNYuQjQEKOFsXyXVu2Af1uINk1iEytBNmpiCudQ7VEOi+D+1mFcT1Ua+tPgZGY2x98K gMJZdOKtrPwX7/485BRVDLiwhdF8pZ3QmprJRnqxA2gG6RKIH4H8NxzhHoj3biyyHscQ u3yA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=VEjDpMV9FqHd8EpFEvxdteRzPjno13eoyZu2+rp7hAQ=; b=WBcE9eM6pCEzHn2bTewUdl3Es1CJNJkkB/4U3r2oa35ecvWZLVr/smGP+Z1Bc8gVVG ObjnORVwmuJIzjgLwbbFjk56PWDDJhxnXSBoVtrZScOMn9yzWjCV5M0BQTDCuPRJi+/l jyxCKZ1gpWBgFnRP771xtQXyb+yrzIw5D1/xWxFGemxkp0xJZp62qPgJsrl1ug6UexLN nzZMjBr/iNUxNrd3MOwyFSeBvHhvnKuoL4/+H9qDG4X6sCeEANENStUkKnpSAj8987XE HGTp5NGS9VcvfrAfR5n47C3F+DCDp68LuSM55IgXdpDzkE6Xj9nCl0A866lUPjVaTfK/ kTcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@postmarketos.org header.s=donut header.b=XRdXyhrB; 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 p4-20020a637f44000000b0046b3dce8455si410740pgn.14.2022.10.16.07.50.08; Sun, 16 Oct 2022 07:50:20 -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=XRdXyhrB; 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 S229751AbiJPOsh (ORCPT + 99 others); Sun, 16 Oct 2022 10:48:37 -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 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?1746856124353579512?= X-GMAIL-MSGID: =?utf-8?q?1746856124353579512?= 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 @@ / { 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>;