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