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;
Date:   Sun, 16 Oct 2022 14:34:26 +0000
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 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
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

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

Signed-off-by: Caleb Connolly <caleb@connolly.tech>
---
 .../boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 29 ++-----------------
 1 file changed, 3 insertions(+), 26 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts b/arch/ar=
m64/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 @@ / {
 =09qcom,msm-id =3D <321 0x20001>;

 =09aliases {
-=09=09hsuart0 =3D &uart6;
+=09=09serial1 =3D &uart6;
 =09};

 =09gpio-keys {
@@ -481,6 +481,8 @@ wcd_intr_default: wcd_intr_default {
 &uart6 {
 =09status =3D "okay";

+=09pinctrl-0 =3D <&qup_uart6_4pin>;
+
 =09bluetooth {
 =09=09compatible =3D "qcom,wcn3990-bt";

@@ -567,28 +569,3 @@ &wifi {
 =09vdd-3.3-ch0-supply =3D <&vreg_l25a_3p3>;
 =09vdd-3.3-ch1-supply =3D <&vreg_l23a_3p3>;
 };
-
-/* PINCTRL - additions to nodes defined in sdm845.dtsi */
-
-&qup_uart6_default {
-=09pinmux {
-=09=09pins =3D "gpio45", "gpio46", "gpio47", "gpio48";
-=09=09function =3D "qup6";
-=09};
-
-=09cts {
-=09=09pins =3D "gpio45";
-=09=09bias-disable;
-=09};
-
-=09rts-tx {
-=09=09pins =3D "gpio46", "gpio47";
-=09=09drive-strength =3D <2>;
-=09=09bias-disable;
-=09};
-
-=09rx {
-=09=09pins =3D "gpio48";
-=09=09bias-pull-up;
-=09};
-};
--
2.38.0