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

Commit 82e91074 authored by Evgeniy Borisov's avatar Evgeniy Borisov
Browse files

ARM: dts: msm: camera: Add generic camera node per HW socket 



We create separate node per camera hardware socket.All cameras
connected to same HW slot using the same node. We can use this
node structure in multimodule camera architecture.

Change-Id: I5dcc62b624f41282f1609afb843320453e7e41b4
Signed-off-by: default avatarSreesudhan Ramakrish Ramkumar <srramku@codeaurora.org>
Signed-off-by: default avatarEvgeniy Borisov <eborisov@codeaurora.org>
parent 789cabe5

arch/arm/boot/dts/msm8226-camera-sensor-cdp.dtsi

+59 −0
Original line number Diff line number Diff line
@@ -192,4 +192,63 @@ 
		qcom,sensor-mode = <1>;

		qcom,cci-master = <0>;

	};

	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";

		reg = <0x0>;

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

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

		qcom,actuator-src = <&actuator0>;

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

		cam_vdig-supply = <&pm8226_l5>;

		cam_vana-supply = <&pm8226_l19>;

		cam_vio-supply = <&pm8226_lvs1>;

		cam_vaf-supply = <&pm8226_l15>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana",

			"cam_vaf";

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

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

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

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

		gpios = <&msmgpio 26 0>,

			<&msmgpio 37 0>,

			<&msmgpio 36 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-req-tbl-num = <0 1 2>;

		qcom,gpio-req-tbl-flags = <1 0 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK",

			"CAM_RESET1",

			"CAM_STANDBY";

		qcom,cci-master = <0>;

		status = "ok";

	};



	qcom,camera@1 {

		cell-index = <1>;

		compatible = "qcom,camera";

		reg = <0x1>;

		qcom,csiphy-sd-index = <1>;

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

		cam_vdig-supply = <&pm8226_l5>;

		cam_vana-supply = <&pm8226_l19>;

		cam_vio-supply = <&pm8226_lvs1>;

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

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

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

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

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

		gpios = <&msmgpio 26 0>,

			<&msmgpio 28 0>,

			<&msmgpio 35 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-req-tbl-num = <0 1 2>;

		qcom,gpio-req-tbl-flags = <1 0 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK",

			"CAM_RESET",

			"CAM_STANDBY";

		qcom,cci-master = <0>;

		status = "ok";

	};

};

arch/arm/boot/dts/msm8226-camera-sensor-mtp.dtsi

+63 −0
Original line number Diff line number Diff line
@@ -106,4 +106,67 @@ 
		qcom,cci-master = <0>;

		status = "ok";

	};

	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";

		reg = <0x0>;

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

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

		qcom,mount-angle = <0>;

		qcom,actuator-src = <&actuator0>;

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

		cam_vdig-supply = <&pm8226_l5>;

		cam_vana-supply = <&pm8226_l19>;

		cam_vio-supply = <&pm8226_lvs1>;

		cam_vaf-supply = <&pm8226_l15>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana",

			 "cam_vaf";

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

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

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

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

		qcom,gpio-no-mux = <0>;

		gpios = <&msmgpio 26 0>,

			<&msmgpio 37 0>,

			<&msmgpio 35 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-req-tbl-num = <0 1 2>;

		qcom,gpio-req-tbl-flags = <1 0 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK",

			"CAM_RESET1",

			"CAM_STANDBY";

		qcom,cci-master = <0>;

		status = "ok";

	};



	qcom,camera@1 {

		cell-index = <1>;

		compatible = "qcom,camera";

		reg = <0x1>;

		qcom,csiphy-sd-index = <1>;

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

		qcom,mount-angle = <270>;

		cam_vdig-supply = <&pm8226_l5>;

		cam_vana-supply = <&pm8226_l19>;

		cam_vio-supply = <&pm8226_lvs1>;

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

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

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

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

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

		qcom,gpio-no-mux = <0>;

		gpios = <&msmgpio 26 0>,

			<&msmgpio 28 0>,

			<&msmgpio 36 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-req-tbl-num = <0 1 2>;

		qcom,gpio-req-tbl-flags = <1 0 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK",

			"CAM_RESET",

			"CAM_STANDBY";

		qcom,cci-master = <0>;

		status = "ok";

	};

};

arch/arm/boot/dts/msm8226-camera-sensor-qrd.dtsi

+77 −0
Original line number Diff line number Diff line
@@ -442,4 +442,81 @@ 
		qcom,cci-master = <0>;

		status = "ok";

	};

	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";

		reg = <0x0>;

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

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

		qcom,mount-angle = <270>;

		qcom,actuator-src = <&actuator0>;

		qcom,eeprom-src = <&eeprom0>;

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

		cam_vdig-supply = <&pm8226_l5>;

		cam_vana-supply = <&pm8226_l19>;

		cam_vio-supply = <&pm8226_lvs1>;

		cam_vaf-supply = <&pm8226_l15>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana",

			 "cam_vaf";

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

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

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

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

		qcom,gpio-no-mux = <0>;

		gpios = <&msmgpio 26 0>,

			<&msmgpio 37 0>,

			<&msmgpio 36 0>,

			<&msmgpio 22 0>,

			<&msmgpio 34 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-vdig = <3>;

		qcom,gpio-af-pwdm = <4>;

		qcom,gpio-req-tbl-num = <0 1 2 3 4>;

		qcom,gpio-req-tbl-flags = <1 0 0 0 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK",

			"CAM_RESET1",

			"CAM_STANDBY",

			"CAM_VDIG",

			"CAM_AF_PWDM";

		qcom,cci-master = <0>;

		status = "ok";

	};



	qcom,camera@1 {

		cell-index = <1>;

		compatible = "qcom,camera";

		reg = <0x1>;

		qcom,csiphy-sd-index = <1>;

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

		qcom,eeprom-src = <&eeprom2>;

		qcom,mount-angle = <270>;

		cam_vdig-supply = <&pm8226_l5>;

		cam_vana-supply = <&pm8226_l19>;

		cam_vio-supply = <&pm8226_lvs1>;

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

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

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

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

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

		qcom,gpio-no-mux = <0>;

		gpios = <&msmgpio 26 0>,

			<&msmgpio 28 0>,

			<&msmgpio 35 0>,

			<&msmgpio 21 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-vdig = <3>;

		qcom,gpio-req-tbl-num = <0 1 2 3>;

		qcom,gpio-req-tbl-flags = <1 0 0 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK",

			"CAM_RESET",

			"CAM_STANDBY",

			"CAM_VDIG";

		qcom,gpio-set-tbl-num = <1 1>;

		qcom,gpio-set-tbl-flags = <0 2>;

		qcom,gpio-set-tbl-delay = <1000 4000>;

		qcom,cci-master = <0>;

		status = "ok";

	};

};

arch/arm/boot/dts/msm8610-camera-sensor-cdp-mtp.dtsi

+61 −0
Original line number Diff line number Diff line
@@ -261,5 +261,66 @@ 
		qcom,sensor-mode = <1>;

		qcom,cci-master = <0>;

	};

	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";

		reg = <0x0>;

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

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

		qcom,mount-angle = <90>;

		qcom,actuator-src = <&actuator0>;

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

		cam_vdig-supply = <&pm8110_l2>;

		cam_vana-supply = <&pm8110_l19>;

		cam_vio-supply = <&pm8110_l14>;

		cam_vaf-supply = <&pm8110_l16>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana",

							 "cam_vaf";

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

		qcom,cam-vreg-min-voltage = <1200000 1800000 2850000 3000000>;

		qcom,cam-vreg-max-voltage = <1200000 1800000 2850000 3000000>;

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

		qcom,gpio-no-mux = <0>;

		gpios = <&msmgpio 13 0>,

			<&msmgpio 21 0>,

			<&msmgpio 20 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-req-tbl-num = <0 1 2>;

		qcom,gpio-req-tbl-flags = <1 0 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK",

			"CAM_RESET1",

			"CAM_STANDBY";

		status = "ok";

	};



	qcom,camera@1 {

		cell-index = <1>;

		compatible = "qcom,camera";

		reg = <0x1>;

		qcom,csiphy-sd-index = <1>;

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

		qcom,mount-angle = <90>;

		cam_vdig-supply = <&pm8110_l4>;

		cam_vana-supply = <&pm8110_l19>;

		cam_vio-supply = <&pm8110_l14>;

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

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

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

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

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

		qcom,gpio-no-mux = <0>;

		gpios = <&msmgpio 14 0>,

			<&msmgpio 15 0>,

			<&msmgpio 8 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-req-tbl-num = <0 1 2>;

		qcom,gpio-req-tbl-flags = <1 0 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK",

			"CAM_RESET",

			"CAM_STANDBY";

		status = "ok";

	};



};

arch/arm/boot/dts/msm8974-camera-sensor-cdp.dtsi

+93 −0
Original line number Diff line number Diff line
@@ -178,4 +178,97 @@ 
		qcom,sensor-mode = <1>;

		qcom,cci-master = <0>;

	};

	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";

		reg = <0x0>;

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

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

		qcom,actuator-src = <&actuator0>;

		qcom,vdd-cx-supply = <&pm8841_s2>;

		qcom,vdd-cx-name = "qcom,vdd-cx";

		cam_vdig-supply = <&pm8941_l3>;

		cam_vana-supply = <&pm8941_l17>;

		cam_vio-supply = <&pm8941_lvs3>;

		cam_vaf-supply = <&pm8941_l23>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana",

				     "cam_vaf";

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

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

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

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

		qcom,gpio-no-mux = <0>;

		gpios = <&msmgpio 15 0>,

			<&msmgpio 90 0>,

			<&msmgpio 89 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-req-tbl-num = <0 1 2>;

		qcom,gpio-req-tbl-flags = <1 0 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK",

					  "CAM_RESET1",

					  "CAM_STANDBY";

		qcom,cci-master = <0>;

		status = "ok";

	};



	qcom,camera@1 {

		cell-index = <1>;

		compatible = "qcom,camera";

		reg = <0x1>;

		qcom,csiphy-sd-index = <1>;

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

		qcom,vdd-cx-supply = <&pm8841_s2>;

		qcom,vdd-cx-name = "qcom,vdd-cx";

		cam_vdig-supply = <&pm8941_l3>;

		cam_vana-supply = <&pm8941_l17>;

		cam_vio-supply = <&pm8941_lvs3>;

		cam_vaf-supply = <&pm8941_l23>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana",

				     "cam_vaf";

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

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

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

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

		gpios = <&msmgpio 16 0>,

			<&msmgpio 92 0>,

			<&msmgpio 91 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-req-tbl-num = <0 1 2>;

		qcom,gpio-req-tbl-flags = <1 0 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK",

					  "CAM_RESET1",

					  "CAM_STANDBY";

		qcom,cci-master = <0>;

		status = "ok";

	};



	qcom,camera@2 {

		cell-index = <2>;

		compatible = "qcom,camera";

		reg = <0x2>;

		qcom,csiphy-sd-index = <2>;

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

		qcom,vdd-cx-supply = <&pm8841_s2>;

		qcom,vdd-cx-name = "qcom,vdd-cx";

		cam_vdig-supply = <&pm8941_l3>;

		cam_vana-supply = <&pm8941_l17>;

		cam_vio-supply = <&pm8941_lvs3>;

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

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

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

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

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

		qcom,gpio-no-mux = <0>;

		gpios = <&msmgpio 17 0>,

			<&msmgpio 18 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-req-tbl-num = <0 1>;

		qcom,gpio-req-tbl-flags = <1 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK",

					  "CAM_RESET1";

		qcom,cci-master = <0>;

		status = "ok";

	};

};