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

Commit b013b68a 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 OIS device in DT"

parents a01ae24f 64e9a900

arch/arm/boot/dts/qcom/msm8994-camera-sensor-cdp.dtsi

+15 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
		qcom,torch-source = <&pmi8994_torch0 &pmi8994_torch1>;

	};

};



&cci {

	actuator0: qcom,actuator@0 {

		cell-index = <0>;
@@ -47,6 +48,19 @@ 
		qcom,cam-vreg-op-mode = <100000>;

	};



	ois0: qcom,ois@0 {

		cell-index = <0>;

		reg = <0x0>;

		compatible = "qcom,ois";

		qcom,cci-master = <0>;

		cam_vaf-supply = <&pm8994_l23>;

		qcom,cam-vreg-name = "cam_vaf";

		qcom,cam-vreg-type = <0>;

		qcom,cam-vreg-min-voltage = <2800000>;

		qcom,cam-vreg-max-voltage = <2800000>;

		qcom,cam-vreg-op-mode = <100000>;

	};



	eeprom0: qcom,eeprom@0 {

		cell-index = <0>;

		reg = <0x0>;
@@ -168,6 +182,7 @@ 
		qcom,mount-angle = <90>;

		qcom,eeprom-src = <&eeprom0>;

		qcom,actuator-src = <&actuator0>;

		qcom,ois-src = <&ois0>;

		qcom,led-flash-src = <&led_flash0>;

		cam_vdig-supply = <&pm8994_l27>;

		cam_vio-supply = <&pm8994_lvs1>;

arch/arm/boot/dts/qcom/msm8994-camera-sensor-liquid.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -48,6 +48,19 @@ 
		qcom,cam-vreg-op-mode = <100000>;

	};



	ois0: qcom,ois@0 {

		cell-index = <0>;

		reg = <0x0>;

		compatible = "qcom,ois";

		qcom,cci-master = <0>;

		cam_vaf-supply = <&pm8994_l23>;

		qcom,cam-vreg-name = "cam_vaf";

		qcom,cam-vreg-type = <0>;

		qcom,cam-vreg-min-voltage = <2800000>;

		qcom,cam-vreg-max-voltage = <2800000>;

		qcom,cam-vreg-op-mode = <100000>;

	};



	eeprom0: qcom,eeprom@0 {

		cell-index = <0>;

		reg = <0x0>;
@@ -169,6 +182,7 @@ 
		qcom,mount-angle = <0>;

                qcom,eeprom-src = <&eeprom0>;

		qcom,actuator-src = <&actuator0>;

		qcom,ois-src = <&ois0>;

		qcom,led-flash-src = <&led_flash0>;

		cam_vdig-supply = <&pm8994_l27>;

		cam_vio-supply = <&pm8994_lvs1>;

arch/arm/boot/dts/qcom/msm8994-camera-sensor-mtp.dtsi

+16 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
		qcom,torch-source = <&pmi8994_torch0 &pmi8994_torch1>;

	};

};



&cci {

	actuator0: qcom,actuator@0 {

		cell-index = <0>;
@@ -47,6 +48,20 @@ 
		qcom,cam-vreg-op-mode = <100000>;

	};





	ois0: qcom,ois@0 {

		cell-index = <0>;

		reg = <0x0>;

		compatible = "qcom,ois";

		qcom,cci-master = <0>;

		cam_vaf-supply = <&pm8994_l23>;

		qcom,cam-vreg-name = "cam_vaf";

		qcom,cam-vreg-type = <0>;

		qcom,cam-vreg-min-voltage = <2800000>;

		qcom,cam-vreg-max-voltage = <2800000>;

		qcom,cam-vreg-op-mode = <100000>;

	};



	eeprom0: qcom,eeprom@0 {

		cell-index = <0>;

		reg = <0x0>;
@@ -168,6 +183,7 @@ 
		qcom,mount-angle = <270>;

		qcom,eeprom-src = <&eeprom0>;

		qcom,actuator-src = <&actuator0>;

		qcom,ois-src = <&ois0>;

		qcom,led-flash-src = <&led_flash0>;

		cam_vdig-supply = <&pm8994_l27>;

		cam_vio-supply = <&pm8994_lvs1>;