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

Commit ad1ad9ef 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 a UIM device to fsm9900 targets"

parents cdebcc3e 269794e7

arch/arm/boot/dts/qcom/fsm9900-cdp.dts

+5 −0
Original line number Diff line number Diff line
@@ -35,6 +35,11 @@ 
		status = "ok";

	};



	uim0: qcom,uim@f995d000 {

		status = "ok";

		qcom,uim-1v8;

	};



	qcom,wdt@f9017000 {

		status = "disabled";

	};

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

+5 −0
Original line number Diff line number Diff line
@@ -35,6 +35,11 @@ 
		status = "ok";

	};



	uim0: qcom,uim@f995d000 {

		status = "ok";

		qcom,uim-1v8;

	};



	qcom,wdt@f9017000 {

		status = "disabled";

	};

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

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

	};



	qcom,uim@f995d000 { /* BLSP2_UART1 */

		compatible = "qcom,uim";

		reg = <0xf995d000 0x1000>;

		interrupts = <0 101 0>;

		status = "disabled";

		qcom,uim-data-gpio = <&msmgpio 24 0>;

		qcom,uim-clk-gpio = <&msmgpio 25 0>;

		qcom,uim-reset-gpio = <&msmgpio 26 0>;

		qcom,uim-card-detect-gpio = <&msmgpio 27 0>;

	};



	qcom,smem@1c100000 {

		compatible = "qcom,smem";

		reg = <0x1c100000 0x200000>,