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

Commit 32bd50d2 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:8974 update generic cam entries"

parents d3500abc 7f509abf

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

+22 −132
Original line number Diff line number Diff line
@@ -39,120 +39,6 @@ 
		qcom,cam-vreg-op-mode = <100000>;

	};



	qcom,camera@6e {

		compatible = "qcom,s5k3l1yx";

		reg = <0x6e>;

		qcom,slave-id = <0x6e 0x0 0x3121>;

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

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

		qcom,actuator-src = <&actuator0>;

		qcom,mount-angle = <90>;

		qcom,sensor-name = "s5k3l1yx";

		cam_vdig-supply = <&pm8941_l3>;

		cam_vana-supply = <&pm8941_l17>;

		cam_vio-supply = <&pm8941_lvs3>;

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

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

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

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

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

		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,gpio-set-tbl-num = <1 1>;

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

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

		qcom,csi-lane-assign = <0x4320>;

		qcom,csi-lane-mask = <0x1F>;

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <1>;

		qcom,cci-master = <0>;

		status = "ok";

	};



    qcom,camera@20 {

		compatible = "qcom,imx135";

		reg = <0x20>;

		qcom,slave-id = <0x20 0x0016 0x0135>;

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

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

		qcom,mount-angle = <90>;

		qcom,sensor-name = "imx135";

		qcom,actuator-src = <&actuator1>;

		cam_vdig-supply = <&pm8941_l3>;

		cam_vana-supply = <&pm8941_l17>;

		cam_vio-supply = <&pm8941_lvs3>;

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

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

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

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

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

		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,gpio-set-tbl-num = <1 1>;

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

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

		qcom,csi-lane-assign = <0x4320>;

		qcom,csi-lane-mask = <0x1F>;

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

	        qcom,sensor-type = <0>;

		qcom,cci-master = <0>;

		status = "ok";

	};



	qcom,camera@6c {

		compatible = "qcom,ov2720";

		reg = <0x6c>;

		qcom,slave-id = <0x6c 0x300A 0x2720>;

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

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

		qcom,mount-angle = <90>;

		qcom,sensor-name = "ov2720";

		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,gpio-set-tbl-num = <1 1>;

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

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

		qcom,csi-lane-assign = <0x4320>;

		qcom,csi-lane-mask = <0x7>;

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <1>;

		qcom,cci-master = <0>;

		status = "ok";

	};



	qcom,camera@90 {

		compatible = "qcom,mt9m114";

		reg = <0x90>;
@@ -186,15 +72,15 @@ 
		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,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>;
@@ -211,9 +97,11 @@ 
		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,gpio-req-tbl-label = "CAMIF_MCLK0",

					  "CAM_RESET0",

					  "CAM_STANDBY0";

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "ok";

	};
@@ -224,8 +112,7 @@ 
		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";

		qcom,mount-angle = <90>;

		cam_vdig-supply = <&pm8941_l3>;

		cam_vana-supply = <&pm8941_l17>;

		cam_vio-supply = <&pm8941_lvs3>;
@@ -241,9 +128,11 @@ 
		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",

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

					  "CAM_RESET1",

					  "CAM_STANDBY";

					  "CAM_STANDBY1";

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "ok";

	};
@@ -251,19 +140,18 @@ 
	qcom,camera@2 {

		cell-index = <2>;

		compatible = "qcom,camera";

		reg = <0x2>;

		reg = <0x02>;

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

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

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

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

		qcom,mount-angle = <90>;

		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,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";

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

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

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

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

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

		gpios = <&msmgpio 17 0>,

			<&msmgpio 18 0>,
@@ -272,9 +160,11 @@ 
		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",

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

					  "CAM_RESET2",

					  "CAM_STANDBY2";

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "ok";

	};

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

+34 −142
Original line number Diff line number Diff line
@@ -40,120 +40,6 @@ 
		qcom,cam-vreg-op-mode = <100000>;

	};



	qcom,camera@6e {

		compatible = "qcom,s5k3l1yx";

		reg = <0x6e>;

		qcom,slave-id = <0x6e 0x0 0x3121>;

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

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

		qcom,mount-angle = <0>;

		qcom,actuator-src = <&actuator0>;

		qcom,sensor-name = "s5k3l1yx";

		cam_vdig-supply = <&pm8941_l3>;

		cam_vana-supply = <&pm8941_l17>;

		cam_vio-supply = <&pm8941_lvs2>;

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

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

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

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

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

		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,gpio-set-tbl-num = <1 1>;

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

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

		qcom,csi-lane-assign = <0x4320>;

		qcom,csi-lane-mask = <0x1F>;

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <1>;

		qcom,cci-master = <0>;

		status = "ok";

	};



    qcom,camera@20 {

		compatible = "qcom,imx135";

		reg = <0x20>;

		qcom,slave-id = <0x20 0x0016 0x0135>;

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

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

		qcom,mount-angle = <0>;

		qcom,sensor-name = "imx135";

		qcom,actuator-src = <&actuator1>;

		cam_vdig-supply = <&pm8941_l3>;

		cam_vana-supply = <&pm8941_l17>;

		cam_vio-supply = <&pm8941_lvs2>;

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

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

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

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

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

		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,gpio-set-tbl-num = <1 1>;

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

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

		qcom,csi-lane-assign = <0x4320>;

		qcom,csi-lane-mask = <0x1F>;

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

	        qcom,sensor-type = <0>;

		qcom,cci-master = <0>;

		status = "ok";

	};



	qcom,camera@6c {

		compatible = "qcom,ov2720";

		reg = <0x6c>;

		qcom,slave-id = <0x6c 0x300A 0x2720>;

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

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

		qcom,mount-angle = <180>;

		qcom,sensor-name = "ov2720";

		cam_vdig-supply = <&pm8941_l3>;

		cam_vana-supply = <&pm8941_l17>;

		cam_vio-supply = <&pm8941_lvs2>;

		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,gpio-set-tbl-num = <1 1>;

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

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

		qcom,csi-lane-assign = <0x4320>;

		qcom,csi-lane-mask = <0x7>;

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <1>;

		qcom,cci-master = <0>;

		status = "ok";

	};



	qcom,camera@90 {

		compatible = "qcom,mt9m114";

		reg = <0x90>;
@@ -187,24 +73,24 @@ 
		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 = <0>;

		qcom,mount-angle = <90>;

		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_lvs2>;

		cam_vio-supply = <&pm8941_lvs3>;

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

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

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

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

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

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

		gpios = <&msmgpio 15 0>,

			<&msmgpio 90 0>,

			<&msmgpio 89 0>;
@@ -212,9 +98,11 @@ 
		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,gpio-req-tbl-label = "CAMIF_MCLK0",

					  "CAM_RESET0",

					  "CAM_STANDBY0";

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "ok";

	};
@@ -224,26 +112,28 @@ 
		compatible = "qcom,camera";

		reg = <0x1>;

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

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

		qcom,mount-angle = <180>;

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

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

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

		qcom,mount-angle = <90>;

		cam_vdig-supply = <&pm8941_l3>;

		cam_vana-supply = <&pm8941_l17>;

		cam_vio-supply = <&pm8941_lvs2>;

		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>;

		cam_vio-supply = <&pm8941_lvs3>;

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

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

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

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

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

		gpios = <&msmgpio 16 0>,

			<&msmgpio 92 0>,

			<&msmgpio 91 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,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_MCLK1",

					  "CAM_RESET1",

					  "CAM_STANDBY1";

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "ok";

	};
@@ -251,11 +141,10 @@ 
	qcom,camera@2 {

		cell-index = <2>;

		compatible = "qcom,camera";

		reg = <0x2>;

		reg = <0x02>;

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

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

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

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

		qcom,mount-angle = <90>;

		cam_vdig-supply = <&pm8941_l3>;

		cam_vana-supply = <&pm8941_l17>;

		cam_vio-supply = <&pm8941_lvs3>;
@@ -264,6 +153,7 @@ 
		qcom,cam-vreg-min-voltage = <1225000 0 2850000>;

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

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

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

		gpios = <&msmgpio 17 0>,

			<&msmgpio 18 0>,

			<&msmgpio 28 0>;
@@ -271,9 +161,11 @@ 
		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",

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

					  "CAM_RESET2",

					  "CAM_STANDBY2";

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "ok";

	};

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

+22 −133
Original line number Diff line number Diff line
@@ -49,123 +49,6 @@ 
		qcom,cam-vreg-op-mode = <100000>;

	};



	qcom,camera@6e {

		compatible = "qcom,s5k3l1yx";

		reg = <0x6e>;

		qcom,slave-id = <0x6e 0x0 0x3121>;

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

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

		qcom,actuator-src = <&actuator0>;

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

		qcom,mount-angle = <90>;

		qcom,sensor-name = "s5k3l1yx";

		cam_vdig-supply = <&pm8941_l3>;

		cam_vana-supply = <&pm8941_l17>;

		cam_vio-supply = <&pm8941_lvs3>;

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

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

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

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

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

		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,gpio-set-tbl-num = <1 1>;

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

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

		qcom,csi-lane-assign = <0x4320>;

		qcom,csi-lane-mask = <0x1F>;

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <1>;

		qcom,cci-master = <0>;

		status = "ok";

	};



    qcom,camera@20 {

		compatible = "qcom,imx135";

		reg = <0x20>;

		qcom,slave-id = <0x20 0x0016 0x0135>;

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

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

		qcom,mount-angle = <90>;

		qcom,sensor-name = "imx135";

		qcom,actuator-src = <&actuator1>;

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

		cam_vdig-supply = <&pm8941_l3>;

		cam_vana-supply = <&pm8941_l17>;

		cam_vio-supply = <&pm8941_lvs3>;

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

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

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

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

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

		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,gpio-set-tbl-num = <1 1>;

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

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

		qcom,csi-lane-assign = <0x4320>;

		qcom,csi-lane-mask = <0x1F>;

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

	        qcom,sensor-type = <0>;

		qcom,cci-master = <0>;

		status = "ok";

	};





	qcom,camera@6c {

		compatible = "qcom,ov2720";

		reg = <0x6c>;

		qcom,slave-id = <0x6c 0x300A 0x2720>;

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

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

		qcom,mount-angle = <90>;

		qcom,sensor-name = "ov2720";

		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,gpio-set-tbl-num = <1 1>;

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

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

		qcom,csi-lane-assign = <0x4320>;

		qcom,csi-lane-mask = <0x7>;

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <1>;

		qcom,cci-master = <1>;

		status = "ok";

	};



	qcom,camera@90 {

		compatible = "qcom,mt9m114";

		reg = <0x90>;
@@ -199,6 +82,7 @@ 
		qcom,sensor-mode = <1>;

		qcom,cci-master = <0>;

	};



	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";
@@ -208,8 +92,6 @@ 
		qcom,mount-angle = <90>;

		qcom,actuator-src = <&actuator0>;

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

		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>;
@@ -218,6 +100,7 @@ 
		qcom,cam-vreg-min-voltage = <1225000 0 2850000>;

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

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

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

		gpios = <&msmgpio 15 0>,

			<&msmgpio 90 0>,

			<&msmgpio 89 0>;
@@ -225,9 +108,11 @@ 
		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,gpio-req-tbl-label = "CAMIF_MCLK0",

					  "CAM_RESET0",

					  "CAM_STANDBY0";

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "ok";

	};
@@ -237,10 +122,8 @@ 
		compatible = "qcom,camera";

		reg = <0x1>;

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

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

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

		qcom,mount-angle = <90>;

		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>;
@@ -249,13 +132,18 @@ 
		qcom,cam-vreg-min-voltage = <1225000 0 2850000>;

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

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

		gpios = <&msmgpio 17 0>,

			<&msmgpio 18 0>;

		gpios = <&msmgpio 16 0>,

			<&msmgpio 92 0>,

			<&msmgpio 91 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,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_MCLK1",

					  "CAM_RESET1",

					  "CAM_STANDBY1";

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "ok";

	};
@@ -283,11 +171,12 @@ 
		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",

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

					  "CAM_RESET2",

					  "CAM_STANDBY2";

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <1>;

		status = "ok";

	};



};

arch/arm/boot/dts/qcom/msm8974-v2.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -243,17 +243,17 @@ 


&cci {



	qcom,camera@6e {

	qcom,camera@0 {

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

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

	};



	qcom,camera@20 {

	qcom,camera@1 {

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

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

	};



	qcom,camera@6c {

	qcom,camera@2 {

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

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

	};

arch/arm/mach-msm/clock-gcc-8974.c

+0 −2
Original line number Diff line number Diff line
@@ -2517,8 +2517,6 @@ static struct clk_lookup msm_clocks_gcc_8974[] = { 


static struct clk_lookup msm_clocks_gcc_8974_only[] = {

	/* Camera Sensor clocks */

	CLK_LOOKUP_OF("cam_src_clk", gp1_clk_src, "6c.qcom,camera"),

	CLK_LOOKUP_OF("cam_clk", gcc_gp1_clk, "6c.qcom,camera"),

	CLK_LOOKUP_OF("cam_src_clk", gp1_clk_src, "2.qcom,camera"),

	CLK_LOOKUP_OF("cam_clk", gcc_gp1_clk, "2.qcom,camera"),

};