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";