Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d0d2371 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: fix HSUART configs for 8994"

parents e1ce01c5 fa709cad

arch/arm/boot/dts/qcom/msm8994-cdp-interposer.dts

+10 −0
Original line number Diff line number Diff line
@@ -14,6 +14,16 @@ 
/dts-v1/;



#include "msm8974pro-pm8994.dtsi"

&soc {

	/*

	 * This workaround is needed as 8974 config fails to build

	 * due to the missing blsp2_uart2 label refernce with interposer.

	 * The dummy node needs to be defined before the msm8994-mtp.dtsi

	 * is included as that file has a reference to the blsp2_uart2 label

	 */

	blsp2_uart2: uart@f995e000 {

	};

};

#include "msm8994-cdp.dtsi"



/ {

arch/arm/boot/dts/qcom/msm8994-cdp.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -355,3 +355,7 @@ 
		     &setb_8 &setb_9 &setb_10 &setb_11 &setb_12 &setb_13

		     &setb_14 &setb_15 &setb_16 &setb_17 &setb_18>;

};



&blsp2_uart2 {

	status = "ok";

};

arch/arm/boot/dts/qcom/msm8994-mtp-interposer.dts

+10 −0
Original line number Diff line number Diff line
@@ -14,6 +14,16 @@ 
/dts-v1/;



#include "msm8974pro-pm8994.dtsi"

&soc {

	/*

	 * This workaround is needed as 8974 config fails to build

	 * due to the missing blsp2_uart2 label refernce with interposer.

	 * The dummy node needs to be defined before the msm8994-mtp.dtsi

	 * is included as that file has a reference to the blsp2_uart2 label

	 */

	blsp2_uart2: uart@f995e000 {

	};

};

#include "msm8994-mtp.dtsi"



/ {

arch/arm/boot/dts/qcom/msm8994-mtp.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -312,3 +312,7 @@ 
		qcom,master-en = <1>;

	};

};



&blsp2_uart2 {

	status = "ok";

};

arch/arm/boot/dts/qcom/msm8994-pinctrl.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -43,22 +43,22 @@ 
			};

		};



		blsp1_uart2_active {

			qcom,pins = <&gp 4>, <&gp 5>, <&gp 6>, <&gp 7>;

		blsp2_uart2_active {

			qcom,pins = <&gp 45>, <&gp 46>, <&gp 47>, <&gp 48>;

			qcom,num-grp-pins = <4>;

			qcom,pin-func = <2>;

		        label = "blsp1_uart2_active";

		        label = "blsp2_uart2_active";

			hsuart_active: default {

				drive-strength = <16>;

				bias-disable;

			};

		};



		blsp1_uart2_sleep {

			qcom,pins = <&gp 4>, <&gp 5>, <&gp 6>, <&gp 7>;

		blsp2_uart2_sleep {

			qcom,pins = <&gp 45>, <&gp 46>, <&gp 47>, <&gp 48>;

			qcom,num-grp-pins = <4>;

			qcom,pin-func = <0>;

		        label = "blsp1_uart2_sleep";

		        label = "blsp2_uart2_sleep";

			hsuart_sleep: sleep {

				drive-strength = <2>;

				bias-disable;