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

Commit 9ff2c5d9 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 GPIO support for flash LED for MSMTITANIUM"

parents 9071b6ca 773cf64d
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -125,6 +125,15 @@
	qcom,wave-play-rate-us = <4165>;
};

&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;
};

&blsp1_uart0 {
	status = "ok";
	pinctrl-names = "default";
+9 −0
Original line number Diff line number Diff line
@@ -91,6 +91,15 @@
	qcom,wave-play-rate-us = <4165>;
};

&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;
};

&blsp1_uart0 {
	status = "ok";
	pinctrl-names = "default";
+54 −0
Original line number Diff line number Diff line
@@ -274,6 +274,60 @@
			};
		};

		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;
				};
			};
		};

		spi3 {
			spi3_default: spi3_default {
				/* active state */