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