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