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

Commit a3085d64 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 support for new connection on OTST2 for MSM8952"

parents b27d655b bc8e90d9

arch/arm/boot/dts/qcom/msm-pmi8950.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ 
			qcom,en-ext-pfet-sc-pro;

		};



		qcom,leds@d300 {

		flash_led: qcom,leds@d300 {

			compatible = "qcom,qpnp-flash-led";

			status = "okay";

			reg = <0xd300 0x100>;

arch/arm/boot/dts/qcom/msm8952-cdp.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -333,6 +333,7 @@ 
			pinctrl-names = "flash_led_enable","flash_led_disable";

			pinctrl-0 = <&flash_led_enable>;

			pinctrl-1 = <&flash_led_disable>;

			qcom,follow-otst2-rb-disabled;

		};

	};

};

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

+1 −0
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ 
			pinctrl-names = "flash_led_enable","flash_led_disable";

			pinctrl-0 = <&flash_led_enable>;

			pinctrl-1 = <&flash_led_disable>;

			qcom,follow-otst2-rb-disabled;

		};

	};

};

arch/arm/boot/dts/qcom/msm8952-qrd.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -25,6 +25,10 @@ 
	pinctrl-0 = <&uart_console_sleep>;

};



&flash_led {

	qcom,follow-otst2-rb-disabled;

};



&sdhc_1 {

	vdd-supply = <&pm8950_l8>;

	qcom,vdd-voltage-level = <2900000 2900000>;