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

Commit d4a6f4b3 authored Sep 21, 2019 by qctecmdr Committed by Gerrit - the friendly Code Review server Sep 21, 2019

Merge "ARM: dts: msm: Move pm8150b and USB configuration"

parents aed6c237 964e656b

arch/arm64/boot/dts/qcom/sdxprairie-mtp-le-cpe.dts

+0 −32

Original line number	Diff line number	Diff line
		@@ -20,35 +20,3 @@
		"qcom,sdxprairie", "qcom,mtp";
		qcom,board-id = <0xB010008 0x0>;
		};

		/* delete pm8150b nodes */
		&soc {
		/delete-node/ thermal-zones;
		};

		&usb {
		extcon = <&vbus_detect>;
		};

		&spmi_bus {
		/delete-node/ qpnp,fg;
		/delete-node/ bcl@1d00;
		/delete-node/ qcom,usb-pdphy@1700;
		/delete-node/ qcom,qpnp-smb5;
		/delete-node/ adc_tm@3500;
		/delete-node/ vadc@3100;
		/delete-node/ qcom,pm8150b@2;
		/delete-node/ qcom,pm8150b@3;
		};

		&qnand_1 {
		status = "ok";
		};

		&blsp1_uart2b_hs {
		status = "okay";
		};

		&vbus_detect {
		status = "okay";
		};

arch/arm64/boot/dts/qcom/sdxprairie-mtp-le-cpe.dtsi

+31 −0

Original line number	Diff line number	Diff line
		@@ -21,3 +21,34 @@
		qcom,force-warm-reboot;
		};

		/* delete pm8150b nodes */
		&soc {
		/delete-node/ thermal-zones;
		};

		&usb {
		extcon = <&vbus_detect>;
		};

		&spmi_bus {
		/delete-node/ qpnp,fg;
		/delete-node/ bcl@1d00;
		/delete-node/ qcom,usb-pdphy@1700;
		/delete-node/ qcom,qpnp-smb5;
		/delete-node/ adc_tm@3500;
		/delete-node/ vadc@3100;
		/delete-node/ qcom,pm8150b@2;
		/delete-node/ qcom,pm8150b@3;
		};

		&qnand_1 {
		status = "ok";
		};

		&blsp1_uart2b_hs {
		status = "ok";
		};

		&vbus_detect {
		status = "ok";
		};