From patchwork Sun Oct 16 14:34:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 3027 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1042175wrs; Sun, 16 Oct 2022 07:37:51 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6aCaPKyaYW1+uAQlrbNQ1sBa1NE4cDP3jbBXJJGxSaluvv/SLtAyhg+eQgF6dlyjP6cmyz X-Received: by 2002:a63:1308:0:b0:440:5517:c99d with SMTP id i8-20020a631308000000b004405517c99dmr6654555pgl.550.1665931071364; Sun, 16 Oct 2022 07:37:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665931071; cv=none; d=google.com; s=arc-20160816; b=WnGcTsYA5ROUAvD82d/SsNW/FYwUA6ZQ/RqgKIpleYWmDxXkLQcQ3m00Me6inWijEP Gj6swI2sZmMbQfUFjavRPhkT92SiLtC2ufhxezh0hxx+bv9mGYoJm7g8pAiuQnpYiJvD UEQ/pfruK7m2yxOWfCF3HeBW40pH0xKfO/QJ0RTl28rGiX1fEjPwC530Tw6HZ087nR3M 0DnVOtmMjCcRiMJ4Pmliw/f46WjnI7FtVuKKmVXF4DLORz5G8JyTPS9KLUptq5ug56xc mYMyhXbNA+fU8+rx5XA4HzZN1D5oxXbJ1NeISDBof7KO5sdozpAF4SV/+7Okg1N9c2An qWmQ== 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=GMeupPgWWUPw0EJDTFY+bM7LAhXLvu31+otdHSQX2LA=; b=PV8u7fbax0waGsJCbGkNwrsETvG84xaeHYtw2hNxOQnP8V0HJgoEex6DJebJD7mnOq BIQIrIPs4a77mYSCM5B2h4p5xSpdg9kGSzocUFwZb09E8TuSHZjHQ5Nphczt97cN6/97 xQLWTOUssPSI5/XWfXNcJsqpsBeYj1HHIg4UAOh/KXXMj6l3PdCY1O1NpNnGpd/iI/uO OdSZ8YJwPhm9BmZc6xhykwLaELMwDGrr7/BRyiPxtKFG8njV2zeFexKD3iXXDTYS8rkQ 0/YcR5QECeLyswJLJNajQ8Uq5bFl4dsQsnh1Xc7TslBltlbnDFnDHDe2x5UsakimhdLQ MXWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@connolly.tech header.s=protonmail header.b=ITCkkYTj; 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 s10-20020a170902ea0a00b0017eafc16b97si10674687plg.397.2022.10.16.07.37.38; Sun, 16 Oct 2022 07:37:51 -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=ITCkkYTj; 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 S229867AbiJPOfD (ORCPT + 99 others); Sun, 16 Oct 2022 10:35:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229884AbiJPOex (ORCPT ); Sun, 16 Oct 2022 10:34:53 -0400 Received: from mail-4022.proton.ch (mail-4022.proton.ch [185.70.40.22]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C4B017883; Sun, 16 Oct 2022 07:34:50 -0700 (PDT) Date: Sun, 16 Oct 2022 14:34:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=connolly.tech; s=protonmail; t=1665930888; x=1666190088; bh=GMeupPgWWUPw0EJDTFY+bM7LAhXLvu31+otdHSQX2LA=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=ITCkkYTjzq9wMdiL6h3/5tCqzncywXVBxrcr8kOjPPCj1kAAubkbpMZS8AdeMSKRo mdp6Kjhr1gVKAMQSo8dqb2fxj73bqMcL458m4+domQBjee8ZNxzQKgdnjVf2WYJvfp lcfl7UJu/eplPZtjUYkEJeW0FdGFll8UtyCKHnfE= 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 6/7] arm64: dts: qcom: sdm845-xiaomi-polaris: commonize uart6 pinconf Message-ID: <20221016143300.1738550-7-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?1746855338755034715?= X-GMAIL-MSGID: =?utf-8?q?1746855338755034715?= 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(-) -- 2.38.0 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; - }; -};