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

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

Merge "ARM: dts: msm: Add actuator node for rear aux camera on SDM670" into dev/msm-4.9-camx

parents 83ad0691 30c08753

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

+16 −2
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ 
		rgltr-load-current = <0>;

	};



	actuator_front: qcom,actuator@1 {

	actuator_rear_aux: qcom,actuator@1 {

		cell-index = <1>;

		reg = <0x1>;

		compatible = "qcom,actuator";
@@ -142,6 +142,19 @@ 
		rgltr-load-current = <0>;

	};



	actuator_front: qcom,actuator@2 {

		cell-index = <2>;

		reg = <0x2>;

		compatible = "qcom,actuator";

		cci-master = <1>;

		cam_vaf-supply = <&actuator_regulator>;

		regulator-names = "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <2800000>;

		rgltr-max-voltage = <2800000>;

		rgltr-load-current = <0>;

	};



	ois_rear: qcom,ois@0 {

		cell-index = <0>;

		reg = <0x0>;
@@ -316,10 +329,11 @@ 
		compatible = "qcom,cam-sensor";

		reg = <0x1>;

		csiphy-sd-index = <1>;

		sensor-position-roll = <90>;

		sensor-position-roll = <270>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		led-flash-src = <&led_flash_rear_aux>;

		actuator-src = <&actuator_rear_aux>;

		eeprom-src = <&eeprom_rear_aux>;

		cam_vio-supply = <&camera_vio_ldo>;

		cam_vana-supply = <&camera_vana_ldo>;

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

+16 −2
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ 
		rgltr-load-current = <0>;

	};



	actuator_front: qcom,actuator@1 {

	actuator_rear_aux: qcom,actuator@1 {

		cell-index = <1>;

		reg = <0x1>;

		compatible = "qcom,actuator";
@@ -142,6 +142,19 @@ 
		rgltr-load-current = <0>;

	};



	actuator_front: qcom,actuator@2 {

		cell-index = <2>;

		reg = <0x2>;

		compatible = "qcom,actuator";

		cci-master = <1>;

		cam_vaf-supply = <&actuator_regulator>;

		regulator-names = "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <2800000>;

		rgltr-max-voltage = <2800000>;

		rgltr-load-current = <0>;

	};



	ois_rear: qcom,ois@0 {

		cell-index = <0>;

		reg = <0x0>;
@@ -316,10 +329,11 @@ 
		compatible = "qcom,cam-sensor";

		reg = <0x1>;

		csiphy-sd-index = <1>;

		sensor-position-roll = <90>;

		sensor-position-roll = <270>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		led-flash-src = <&led_flash_rear_aux>;

		actuator-src = <&actuator_rear_aux>;

		eeprom-src = <&eeprom_rear_aux>;

		cam_vio-supply = <&camera_vio_ldo>;

		cam_vana-supply = <&camera_vana_ldo>;