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

Commit 680700fc authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Enable front camera flash for SDM670 CDP/MTP" into dev/msm-4.9-camx

parents 32e5ae5b c168aaea

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

+6 −0
Original line number Diff line number Diff line
@@ -41,6 +41,12 @@ 
	status = "ok";

};



&pm660l_switch1 {

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

	pinctrl-0 = <&flash_led3_front_en>;

	pinctrl-1 = <&flash_led3_front_dis>;

};



&qupv3_se9_2uart {

	status = "disabled";

};

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

+6 −0
Original line number Diff line number Diff line
@@ -42,6 +42,12 @@ 
	status = "ok";

};



&pm660l_switch1 {

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

	pinctrl-0 = <&flash_led3_front_en>;

	pinctrl-1 = <&flash_led3_front_dis>;

};



&qupv3_se9_2uart {

	status = "disabled";

};

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

+30 −0
Original line number Diff line number Diff line
@@ -1558,6 +1558,36 @@ 
			};

		};



		flash_led3_front {

			flash_led3_front_en: flash_led3_front_en {

				mux {

					pins = "gpio21";

					function = "gpio";

				};



				config {

					pins = "gpio21";

					drive_strength = <2>;

					output-high;

					bias-disable;

				};

			};



			flash_led3_front_dis: flash_led3_front_dis {

				mux {

					pins = "gpio21";

					function = "gpio";

				};



				config {

					pins = "gpio21";

					drive_strength = <2>;

					output-low;

					bias-disable;

				};

			};

		};



		/* Pinctrl setting for CAMERA GPIO key */

		key_cam_snapshot {

			key_cam_snapshot_default: key_cam_snapshot_default {