Merge "ARM: dts: msm: enable right ov7251 sensor for apq8096 drone" (febba518) · Commits · e / devices / android_kernel_xiaomi_markw

arch/arm/boot/dts/qcom/apq8096-camera-sensor-drone.dtsi

+43 −2

Original line number	Diff line number	Diff line
		@@ -168,7 +168,7 @@
		qcom,csiphy-sd-index = <1>;
		qcom,csid-sd-index = <1>;
		qcom,mount-angle = <0>;
		cam_vdig-supply = <&vph_pwr_vreg>;
		cam_vdig-supply = <&pm8994_l3>;
		/* Cameras powered by PMIC: */
		cam_vio-supply = <&pm8994_lvs1>;
		cam_vana-supply = <&pm8994_l23>;
		@@ -211,7 +211,7 @@
		qcom,eeprom-src = <&eeprom1>;
		qcom,actuator-src = <&actuator1>;
		/* Cameras powered by PMIC: */
		cam_vdig-supply = <&vph_pwr_vreg>;
		cam_vdig-supply = <&pm8994_l3>;
		cam_vio-supply = <&pm8994_lvs1>;
		cam_vana-supply = <&pm8994_l23>;
		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";
		@@ -242,4 +242,45 @@
		clock-names = "cam_src_clk", "cam_clk";
		qcom,clock-rates = <24000000 0>;
		};

		/* right ov */
		qcom,camera@3 {
		cell-index = <3>;
		compatible = "qcom,camera";
		reg = <0x03>;
		qcom,csiphy-sd-index = <1>;
		qcom,csid-sd-index = <3>;
		qcom,mount-angle = <0>;
		cam_vdig-supply = <&vph_pwr_vreg>;
		/* Cameras powered by PMIC: */
		cam_vio-supply = <&pm8994_lvs1>;
		cam_vana-supply = <&pm8994_l23>;
		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";
		qcom,cam-vreg-min-voltage = <1000000 0 2800000>;
		qcom,cam-vreg-max-voltage = <1000000 0 2800000>;
		qcom,cam-vreg-op-mode = <105000 0 80000>;
		qcom,gpio-no-mux = <0>;
		pinctrl-names = "cam_default", "cam_suspend";
		pinctrl-0 = <&cam_sensor_mclk3_active &cam_csi1_sensor_active>;
		pinctrl-1 = <&cam_sensor_mclk3_suspend
		&cam_csi1_sensor_suspend>;
		gpios = <&tlmm 16 0>,
		<&tlmm 121 0>,
		<&tlmm 29 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_MCLK1",
		"CAM_RESET1",
		"CAM_STANDBY1";
		qcom,sensor-position = <0>;
		qcom,sensor-mode = <0>;
		qcom,cci-master = <1>;
		status = "ok";
		clocks = <&clock_mmss clk_mclk3_clk_src>,
		<&clock_mmss clk_camss_mclk3_clk>;
		clock-names = "cam_src_clk", "cam_clk";
		qcom,clock-rates = <24000000 0>;
		};
		};

arch/arm/boot/dts/qcom/msm8996-pinctrl.dtsi

+30 −0

Original line number	Diff line number	Diff line
		@@ -2271,6 +2271,36 @@
		};
		};

		cam_sensor_mclk3_active: cam_sensor_mclk3_active{
		/* MCLK3 */
		mux {
		/* CLK, DATA */
		pins = "gpio16";
		function = "cam_mclk";
		};

		config {
		pins = "gpio16";
		bias-disable; /* No PULL */
		drive-strength = <2>; /* 2 MA */
		};
		};

		cam_sensor_mclk3_suspend: cam_sensor_mclk3_suspend {
		/* MCLK3 */
		mux {
		/* CLK, DATA */
		pins = "gpio16";
		function = "cam_mclk";
		};

		config {
		pins = "gpio16";
		bias-pull-down; /* PULL DOWN */
		drive-strength = <2>; /* 2 MA */
		};
		};

		cam_sensor_rear2_active: cam_sensor_rear2_active {
		/* RESET, STANDBY */
		mux {