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

Commit ad66ccb5 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 the UART1 entry in fsm9900 MTP"

parents 47ae8a9d ace75b91

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

+5 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
/ {

	aliases {

		serial0 = &uart0;

		serial1 = &uart1;

	};

};
@@ -23,6 +24,10 @@ 
		status = "ok";

	};



	uart1: serial@f9921000 {

		status = "disabled";

	};



	uim0: qcom,uim@f995d000 {

		status = "ok";

		qcom,uim-1v8;

arch/arm/boot/dts/qcom/fsm9900.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -169,6 +169,13 @@ 
		status = "disabled";

	};



	serial@f9921000 {

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

		reg = <0xf9921000 0x1000>;

		interrupts = <0 102 0>;

		status = "disabled";

	};



	qcom,uim@f995d000 { /* BLSP2_UART1 */

		compatible = "qcom,uim";

		reg = <0xf995d000 0x1000>;