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

Commit e851fd74 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 pinctrl configuration for flash LED3 in sdm845 CDP/MTP" into msm-4.9

parents da184123 cd21c812

arch/arm64/boot/dts/qcom/sdm845-cdp.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -118,3 +118,15 @@ 


	status = "ok";

};



&pmi8998_flash2 {

	pinctrl-names = "led_enable", "led_disable";

	pinctrl-0 = <&flash_led3_front_en>;

	pinctrl-1 = <&flash_led3_front_dis>;

};



&pmi8998_torch2 {

	pinctrl-names = "led_enable", "led_disable";

	pinctrl-0 = <&flash_led3_front_en>;

	pinctrl-1 = <&flash_led3_front_dis>;

};

arch/arm64/boot/dts/qcom/sdm845-mtp.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -103,3 +103,15 @@ 


	status = "ok";

};



&pmi8998_flash2 {

	pinctrl-names = "led_enable", "led_disable";

	pinctrl-0 = <&flash_led3_front_en>;

	pinctrl-1 = <&flash_led3_front_dis>;

};



&pmi8998_torch2 {

	pinctrl-names = "led_enable", "led_disable";

	pinctrl-0 = <&flash_led3_front_en>;

	pinctrl-1 = <&flash_led3_front_dis>;

};

arch/arm64/boot/dts/qcom/sdm845-pinctrl.dtsi

+17 −0
Original line number Diff line number Diff line
@@ -66,6 +66,23 @@ 
			};

		};



		flash_led3_front {

			flash_led3_front_en: flash_led3_front_en {

				mux {

					pins = "gpio21";

					drive_strength = <2>;

					output-high;

				};

			};



			flash_led3_front_dis: flash_led3_front_dis {

				mux {

					pins = "gpio21";

					drive_strength = <2>;

					output-low;

				};

			};

		};



		wcd9xxx_intr {

			wcd_intr_default: wcd_intr_default{