Merge "ARM: dts: msm: remove gpio support for rear flash for MSMTITANIUM" (8f4fb2c5) · Commits · e / devices / android_kernel_xiaomi_markw

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -154,9 +154,6 @@
		&flash_led {
		compatible = "qcom,qpnp-flash-led";
		reg = <0xd300 0x100>;
		pinctrl-names = "flash_led_enable","flash_led_disable";
		pinctrl-0 = <&rear_flash_led_enable>;
		pinctrl-1 = <&rear_flash_led_disable>;
		qcom,follow-otst2-rb-disabled;
		};

+0 −3

Original line number	Diff line number	Diff line
		@@ -120,9 +120,6 @@
		&flash_led {
		compatible = "qcom,qpnp-flash-led";
		reg = <0xd300 0x100>;
		pinctrl-names = "flash_led_enable","flash_led_disable";
		pinctrl-0 = <&rear_flash_led_enable>;
		pinctrl-1 = <&rear_flash_led_disable>;
		qcom,follow-otst2-rb-disabled;
		};

+0 −54

Original line number	Diff line number	Diff line
		@@ -652,60 +652,6 @@
		};
		};

		tlmm_pmi_flash_led {
		rear_flash_led_enable: rear_flash_led_enable {
		mux {
		pins = "gpio39";
		function = "gpio";
		};

		config {
		pins = "gpio39";
		drive-strength = <16>;
		output-high;
		};
		};

		rear_flash_led_disable: rear_flash_led_disable {
		mux {
		pins = "gpio39";
		function = "gpio";
		};

		config {
		pins = "gpio39";
		drive-strength = <2>;
		output-low;
		};
		};

		front_flash_led_enable: front_flash_led_enable {
		mux {
		pins = "gpio33";
		function = "gpio";
		};

		config {
		pins = "gpio33";
		drive-strength = <16>;
		output-high;
		};
		};

		front_flash_led_disable: front_flash_led_disable {
		mux {
		pins = "gpio33";
		function = "gpio";
		};

		config {
		pins = "gpio33";
		drive-strength = <2>;
		output-low;
		};
		};
		};

		pmx_rd_nfc_int {
		/qcom,pins = <&gp 17>;/
		pins = "gpio17";