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

Commit d9ebd4ba 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: use labels for UART devices in 8092"

parents b11d8efd b300d689

arch/arm/boot/dts/mpq8092-rumi.dts

+0 −3
Original line number Diff line number Diff line
@@ -22,7 +22,4 @@ 
};



&soc {

	serial@f9922000 {

		status = "ok";

	};

};

arch/arm/boot/dts/mpq8092-rumi.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


/ {

	aliases {

		serial0 = &blsp1_uart5;

		spi0 = &spi_0;

	};

};
@@ -130,6 +131,10 @@ 
	};

};



&blsp1_uart5 {

	status = "ok";

};



&gdsc_venus {

        status = "disabled";

};

arch/arm/boot/dts/mpq8092-sim.dts

+7 −6
Original line number Diff line number Diff line
@@ -18,17 +18,18 @@ 
	model = "Qualcomm MPQ8092 Simulator";

	compatible = "qcom,mpq8092-sim", "qcom,mpq8092", "qcom,sim";

	qcom,board-id = <16 0>;



	aliases {

		serial0 = &blsp1_uart2;

	};

};



&soc {

	serial@f991f000 {

		status = "ok";

};



	serial@f995e000 {

&blsp1_uart2 {

	status = "ok";

};

};



&sdcc1 {

	vdd-supply = <&pma8084_l20>;

arch/arm/boot/dts/mpq8092.dtsi

+2 −9
Original line number Diff line number Diff line
@@ -148,27 +148,20 @@ 
		qcom,master-id = <86>;

	};



	serial@f991f000 {

	blsp1_uart2: serial@f991f000 {

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

		reg = <0xf991f000 0x1000>;

		interrupts = <0 109 0>;

		status = "disabled";

	};



	serial@f9922000 {

	blsp1_uart5: serial@f9922000 {

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

		reg = <0xf9922000 0x1000>;

		interrupts = <0 112 0>;

		status = "disabled";

	};



	serial@f995e000 {

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

		reg = <0xf995e000 0x1000>;

		interrupts = <0 114 0>;

		status = "disabled";

	};



	qcom,msm-imem@fe805000 {

                compatible = "qcom,msm-imem";

                reg = <0xfe805000 0x1000>; /* Address and size of IMEM */