From patchwork Sun Oct 16 14:34:03 2022
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Caleb Connolly <caleb@connolly.tech>
X-Patchwork-Id: 13007809
Return-Path: <linux-arm-msm-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id D9D79C4332F
	for <linux-arm-msm@archiver.kernel.org>;
 Sun, 16 Oct 2022 14:34:17 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S229800AbiJPOeQ (ORCPT
        <rfc822;linux-arm-msm@archiver.kernel.org>);
        Sun, 16 Oct 2022 10:34:16 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51944 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229799AbiJPOeO (ORCPT
        <rfc822;linux-arm-msm@vger.kernel.org>);
        Sun, 16 Oct 2022 10:34:14 -0400
Received: from mail-4018.proton.ch (mail-4018.proton.ch [185.70.40.18])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B477F32D8E
        for <linux-arm-msm@vger.kernel.org>;
 Sun, 16 Oct 2022 07:34:12 -0700 (PDT)
Date: Sun, 16 Oct 2022 14:34:03 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=connolly.tech;
        s=protonmail; t=1665930850; x=1666190050;
        bh=CSTPfSj1OAUNfmI5pgjMNDJRewudlbE5XQ/hVQybyc0=;
        h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date:
         Subject:Reply-To:Feedback-ID:Message-ID;
        b=GvfDqmP5ZzxRR7A9e7jN/c+CchAGpc10ZgcJuaXB+IE9JF0yJULVo0tX/9dyjgBxO
         BGRpydEsAotkOIMqlNOraNEMAkA2f1zCZTQBaKNIO4k6HHdoh4ASHYtqvuV+WDpsAL
         zd2zNAbRqt0obUh7MSg6sLAruz+0aEiIcH+fDxhM=
To: caleb@connolly.tech
From: Caleb Connolly <caleb@connolly.tech>
Cc: Andy Gross <agross@kernel.org>,
        Bjorn Andersson <andersson@kernel.org>,
        devicetree@vger.kernel.org,
        Konrad Dybcio <konrad.dybcio@somainline.org>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org,
        Rob Herring <robh+dt@kernel.org>
Subject: [PATCH 3/7] arm64: dts: qcom: sdm845-db845c: commonize uart6 pinconf
Message-ID: <20221016143300.1738550-4-caleb@connolly.tech>
Feedback-ID: 10753939:user:proton
MIME-Version: 1.0
Precedence: bulk
List-ID: <linux-arm-msm.vger.kernel.org>
X-Mailing-List: linux-arm-msm@vger.kernel.org

Use the new qup_uart6_4pin configuration in sd845.dtsi and fix alias
name.

Signed-off-by: Caleb Connolly <caleb@connolly.tech>
---
 arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 27 +++-------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

--
2.38.0

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