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

Commit c0dada56 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: add support for new connection on OTST2"

parents 9e8eef3f e7deef26

arch/arm/boot/dts/qcom/msm-pmi8994.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ 
			};

		};



		qcom,leds@d300 {

		flash_led: qcom,leds@d300 {

			compatible = "qcom,qpnp-flash-led";

			status = "okay";

			reg = <0xd300 0x100>;

arch/arm/boot/dts/qcom/msm8996-fluid.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -552,6 +552,10 @@ 
	status = "okay";

};



&flash_led {

	qcom,follow-otst2-rb-disabled;

};



&blsp1_uart2 {

	status = "ok";

};

arch/arm/boot/dts/qcom/msm8996-liquid.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -600,6 +600,10 @@ 
	status = "okay";

};



&flash_led {

	qcom,follow-otst2-rb-disabled;

};



&blsp1_uart2 {

	status = "ok";

};

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

+4 −0
Original line number Diff line number Diff line
@@ -787,6 +787,10 @@ 
	status = "okay";

};



&flash_led {

	qcom,follow-otst2-rb-disabled;

};



&blsp1_uart2 {

	status = "ok";

};