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

Commit de250947 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: Add sensor and actuator changes to enable sensor"

parents d258b3d6 14c433fa

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

+8 −53
Original line number Diff line number Diff line
@@ -22,62 +22,17 @@ 


&cci {



	actuator0: qcom,actuator@6e {

		cell-index = <3>;

		reg = <0x6c>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

	};



	actuator1: qcom,actuator@36 {

		cell-index = <1>;

		reg = <0x36>;

	actuator0: qcom,actuator@0 {

		cell-index = <0>;

		reg = <0x0>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

	};



    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,actuator-src = <&actuator1>;

		qcom,mount-angle = <90>;

		qcom,sensor-name = "imx135";

		cam_vana-supply = <&pm8916_l17>;

		cam_vio-supply = <&pm8916_l6>;

		cam_vaf-supply = <&pm8916_l10>;

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

				"cam_vaf";

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

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

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

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

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

		pinctrl-states = "default", "suspend";

		pinctrl-0 = <&cam_sensor_rear_default>;

		pinctrl-1 = <&cam_sensor_rear_sleep>;

		gpios = <&msm_gpio 26 0>,

			<&msm_gpio 35 0>,

			<&msm_gpio 34 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,cam-vreg-name = "cam_vaf";

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

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

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

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

	};



	qcom,camera@78 {

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

+9 −11
Original line number Diff line number Diff line
@@ -22,21 +22,19 @@ 


&cci {



	actuator0: qcom,actuator@6e {

		cell-index = <3>;

		reg = <0x6c>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

	};



	actuator1: qcom,actuator@36 {

		cell-index = <1>;

		reg = <0x36>;

	actuator0: qcom,actuator@0 {

		cell-index = <0>;

		reg = <0x0>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

		cam_vaf-supply = <&pm8916_l10>;

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

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

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

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

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

	};





	qcom,camera@78 {

		compatible = "ovti,ov5645";

		reg = <0x78 0x0>;