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

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

Merge "ARM: dts: msm: Add iris camera flash support for sdm845" into dev/msm-4.9-camx

parents 680700fc f4d78a22

arch/arm64/boot/dts/qcom/pmi8998.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -681,6 +681,14 @@ 
				qcom,led-mask = <4>;

				qcom,default-led-trigger = "switch1_trigger";

			};



			pmi8998_switch2: qcom,led_switch_2 {

				label = "switch";

				qcom,led-name = "led:switch_2";

				qcom,led-mask = <4>;

				qcom,default-led-trigger = "switch2_trigger";

			};



		};



		pmi8998_haptics: qcom,haptics@c000 {

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

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

	};



	led_flash_iris: qcom,camera-flash@3 {

		cell-index = <3>;

		reg = <0x03 0x00>;

		compatible = "qcom,camera-flash";

		flash-source = <&pmi8998_flash2>;

		torch-source = <&pmi8998_torch2>;

		switch-source = <&pmi8998_switch2>;

		status = "ok";

	};



	actuator_regulator: gpio-regulator@0 {

		compatible = "regulator-fixed";

		reg = <0x00 0x00>;
@@ -412,6 +422,7 @@ 
		sensor-position-roll = <270>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <0>;

		led-flash-src = <&led_flash_iris>;

		cam_vio-supply = <&pm8998_lvs1>;

		cam_vana-supply = <&pmi8998_bob>;

		cam_vdig-supply = <&camera_ldo>;

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

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

	};



	led_flash_iris: qcom,camera-flash@3 {

		cell-index = <3>;

		reg = <0x03 0x00>;

		compatible = "qcom,camera-flash";

		flash-source = <&pmi8998_flash2>;

		torch-source = <&pmi8998_torch2>;

		switch-source = <&pmi8998_switch2>;

		status = "ok";

	};



	actuator_regulator: gpio-regulator@0 {

		compatible = "regulator-fixed";

		reg = <0x00 0x00>;
@@ -403,6 +413,7 @@ 
		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};



	qcom,cam-sensor@3 {

		cell-index = <3>;

		compatible = "qcom,cam-sensor";
@@ -411,6 +422,7 @@ 
		sensor-position-roll = <270>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <0>;

		led-flash-src = <&led_flash_iris>;

		cam_vio-supply = <&pm8998_lvs1>;

		cam_vana-supply = <&pmi8998_bob>;

		cam_vdig-supply = <&camera_ldo>;
@@ -445,5 +457,4 @@ 
		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};



};

arch/arm64/boot/dts/qcom/sdm845-interposer-pm660.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -166,6 +166,12 @@ 
	/delete-property/ switch-source;

};



&led_flash_iris {

	/delete-property/ flash-source;

	/delete-property/ torch-source;

	/delete-property/ switch-source;

};



&actuator_regulator {

	/delete-property/ vin-supply;

};

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

+6 −0
Original line number Diff line number Diff line
@@ -263,6 +263,12 @@ 
	pinctrl-1 = <&flash_led3_front_dis>;

};



&pmi8998_switch2 {

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

	pinctrl-0 = <&flash_led3_iris_en>;

	pinctrl-1 = <&flash_led3_iris_dis>;

};



&vendor {

	mtp_batterydata: qcom,battery-data {

		qcom,batt-id-range-pct = <15>;