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

Commit 609720f6 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 MSM8937"

parents da4c7461 5d8c2396

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

+9 −0
Original line number Diff line number Diff line
@@ -13,6 +13,15 @@ 


#include "msm8937-pinctrl.dtsi"



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

};



&soc {

	gpio_keys {

		compatible = "gpio-keys";

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

+9 −0
Original line number Diff line number Diff line
@@ -13,6 +13,15 @@ 


#include "msm8937-pinctrl.dtsi"



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

};



&soc {

	gpio_keys {

		compatible = "gpio-keys";

arch/arm/boot/dts/qcom/msm8937-pinctrl.dtsi

+54 −0
Original line number Diff line number Diff line
@@ -110,6 +110,60 @@ 
			};

		};



		tlmm_pmi_flash_led {

			rear_flash_led_enable: rear_flash_led_enable {

				mux {

					pins = "gpio33";

					function = "gpio";

				};



				config {

					pins = "gpio33";

					drive-strength = <16>;

					output-high;

				};

			};



			rear_flash_led_disable: rear_flash_led_disable {

				mux {

					pins = "gpio33";

					function = "gpio";

				};



				config {

					pins = "gpio33";

					drive-strength = <2>;

					output-low;

				};

			};



			front_flash_led_enable: front_flash_led_enable {

				mux {

					pins = "gpio50";

					function = "gpio";

				};



				config {

					pins = "gpio50";

					drive-strength = <16>;

					output-high;

				};

			};



			front_flash_led_disable: front_flash_led_disable {

				mux {

					pins = "gpio50";

					function = "gpio";

				};



				config {

					pins = "gpio50";

					drive-strength = <2>;

					output-low;

				};

			};

		};



		spi3 {

			spi3_default: spi3_default {

				/* active state */