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

Commit f5bd9728 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: support camera IMX230 EEPROM"

parents 0488452e 8f2acdf5

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

+27 −1
Original line number Diff line number Diff line
@@ -236,6 +236,32 @@ 
		clock-names = "cam_src_clk", "cam_clk";

	};



	eeprom2: qcom,eeprom@a0 {

		cell-index = <0>;

		reg = <0xa0>;

		qcom,eeprom-name = "onsemi_cat24c32";

		compatible = "qcom,eeprom";

		qcom,slave-addr = <0xa0>;

		qcom,cci-master = <0>;

		qcom,num-blocks = <1>;

		qcom,page0 = <0 0 0 0 0 0>;

		qcom,poll0 = <0 0 0 0 0 0>;

		qcom,saddr0 = <0xa0>;

		qcom,mem0 = <2245 0x00 2 0 1 0>;



		cam_vio-supply = <&pm8994_lvs1>;

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

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

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

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

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

		qcom,cam-power-seq-type = "sensor_vreg";

		qcom,cam-power-seq-val = "cam_vio";

		qcom,cam-power-seq-cfg-val = <1>;

		qcom,cam-power-seq-delay = <1>;

		status = "ok";

	};



	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";
@@ -243,7 +269,7 @@ 
		qcom,csiphy-sd-index = <0>;

		qcom,csid-sd-index = <0>;

		qcom,mount-angle = <270>;

		qcom,eeprom-src = <&eeprom0>;

		qcom,eeprom-src = <&eeprom0 &eeprom2>;

		qcom,actuator-src = <&actuator0>;

		qcom,ois-src = <&ois0>;

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

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

+27 −1
Original line number Diff line number Diff line
@@ -236,6 +236,32 @@ 
		clock-names = "cam_src_clk", "cam_clk";

	};



	eeprom2: qcom,eeprom@a0 {

		cell-index = <0>;

		reg = <0xa0>;

		qcom,eeprom-name = "onsemi_cat24c32";

		compatible = "qcom,eeprom";

		qcom,slave-addr = <0xa0>;

		qcom,cci-master = <0>;

		qcom,num-blocks = <1>;

		qcom,page0 = <0 0 0 0 0 0>;

		qcom,poll0 = <0 0 0 0 0 0>;

		qcom,saddr0 = <0xa0>;

		qcom,mem0 = <2245 0x00 2 0 1 0>;



		cam_vio-supply = <&pm8994_lvs1>;

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

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

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

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

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

		qcom,cam-power-seq-type = "sensor_vreg";

		qcom,cam-power-seq-val = "cam_vio";

		qcom,cam-power-seq-cfg-val = <1>;

		qcom,cam-power-seq-delay = <1>;

		status = "ok";

	};



	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";
@@ -243,7 +269,7 @@ 
		qcom,csiphy-sd-index = <0>;

		qcom,csid-sd-index = <0>;

		qcom,mount-angle = <270>;

                qcom,eeprom-src = <&eeprom0>;

                qcom,eeprom-src = <&eeprom0 &eeprom2>;

		qcom,actuator-src = <&actuator0>;

		qcom,ois-src = <&ois0>;

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

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

+27 −1
Original line number Diff line number Diff line
@@ -237,6 +237,32 @@ 
		clock-names = "cam_src_clk", "cam_clk";

	};



	eeprom2: qcom,eeprom@a0 {

		cell-index = <0>;

		reg = <0xa0>;

		qcom,eeprom-name = "onsemi_cat24c32";

		compatible = "qcom,eeprom";

		qcom,slave-addr = <0xa0>;

		qcom,cci-master = <0>;

		qcom,num-blocks = <1>;

		qcom,page0 = <0 0 0 0 0 0>;

		qcom,poll0 = <0 0 0 0 0 0>;

		qcom,saddr0 = <0xa0>;

		qcom,mem0 = <2245 0x00 2 0 1 0>;



		cam_vio-supply = <&pm8994_lvs1>;

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

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

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

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

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

		qcom,cam-power-seq-type = "sensor_vreg";

		qcom,cam-power-seq-val = "cam_vio";

		qcom,cam-power-seq-cfg-val = <1>;

		qcom,cam-power-seq-delay = <1>;

		status = "ok";

	};



	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";
@@ -244,7 +270,7 @@ 
		qcom,csiphy-sd-index = <0>;

		qcom,csid-sd-index = <0>;

		qcom,mount-angle = <270>;

		qcom,eeprom-src = <&eeprom0>;

		qcom,eeprom-src = <&eeprom0 &eeprom2>;

		qcom,actuator-src = <&actuator0>;

		qcom,ois-src = <&ois0>;

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