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

Commit 689fd893 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:8084: Add GPS UART configuration for apq8084-liquid"

parents b3511c95 bc3f6686

arch/arm/boot/dts/apq8084-liquid.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -118,6 +118,12 @@ 
	status = "ok";

};



&blsp2_uart4 {

	qcom,tx-gpio = <&msmgpio 112 0>;

	qcom,rx-gpio = <&msmgpio 113 0>;

	status = "ok";

};



/* CoreSight */

&tpiu {

	qcom,seta-gpios = <&msmgpio 4 0>,

arch/arm/boot/dts/apq8084.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -202,6 +202,20 @@ 
				<86 512 500 800>;

	};



	blsp2_uart4: uart@f9961000 { /* BLSP2 UART4 */

		compatible = "qcom,msm-lsuart-v14";

		reg = <0xf9961000 0x1000>;

		interrupts = <0 117 0>;

		status = "disabled";



		qcom,msm-bus,name = "blsp2_uart4";

		qcom,msm-bus,num-cases = <2>;

		qcom,msm-bus,num-paths = <1>;

		qcom,msm-bus,vectors-KBps =

				<84 512 0 0>,

				<84 512 500 800>;

	};



	qcom,cache_erp {

		compatible = "qcom,cache_erp";

		interrupts = <1 9 0>, <0 2 0>;