Merge "ARM: dts: msm: drone APQ8096 HiRes sensor enable" (1e584348) · Commits · e / devices / android_kernel_xiaomi_markw

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

+40 −0

Original line number	Diff line number	Diff line
		@@ -248,6 +248,46 @@
		"CAM_STANDBY2";
		qcom,sensor-position = <1>;
		qcom,sensor-mode = <0>;
		qcom,cci-master = <0>;
		status = "ok";
		clocks = <&clock_mmss clk_mclk2_clk_src>,
		<&clock_mmss clk_camss_mclk2_clk>;
		clock-names = "cam_src_clk", "cam_clk";
		qcom,clock-rates = <24000000 0>;
		};

		qcom,camera@3 {
		cell-index = <3>;
		compatible = "qcom,camera";
		reg = <0x03>;
		qcom,csiphy-sd-index = <2>;
		qcom,csid-sd-index = <1>;
		qcom,mount-angle = <0>;
		/* Cameras powered by PMIC: */
		cam_vdig-supply = <&vph_pwr_vreg>;
		cam_vio-supply = <&pm8994_lvs1>;
		cam_vana-supply = <&pm8994_l29>;
		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_mclk2_active &cam_csi2_sensor_active>;
		pinctrl-1 = <&cam_sensor_mclk2_suspend
		&cam_csi2_sensor_suspend>;
		gpios = <&tlmm 15 0>,
		<&tlmm 23 0>,
		<&tlmm 133 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_MCLK2",
		"CAM_RESET2",
		"CAM_STANDBY2";
		qcom,sensor-position = <1>;
		qcom,sensor-mode = <0>;
		qcom,cci-master = <1>;
		status = "ok";
		clocks = <&clock_mmss clk_mclk2_clk_src>,

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

+10 −10

Original line number	Diff line number	Diff line
		@@ -128,13 +128,13 @@
		qcom,mount-angle = <0>;
		qcom,actuator-src = <&actuator0>;
		qcom,eeprom-src = <&eeprom0>;
		cam_vdig-supply = <&vph_pwr_vreg>;
		cam_vdig-supply = <&pm8994_l3>;
		/* Cameras powered by PMIC: */
		cam_vio-supply = <&pm8994_lvs1>;
		cam_vana-supply = <&pm8994_l17>;
		cam_vana-supply = <&pm8994_l22>;
		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";
		qcom,cam-vreg-min-voltage = <1300000 0 2500000>;
		qcom,cam-vreg-max-voltage = <1300000 0 2500000>;
		qcom,cam-vreg-min-voltage = <1100000 0 2500000>;
		qcom,cam-vreg-max-voltage = <1100000 0 2500000>;
		qcom,cam-vreg-op-mode = <105000 0 80000>;
		qcom,gpio-no-mux = <0>;
		pinctrl-names = "cam_default", "cam_suspend";
		@@ -170,11 +170,11 @@
		qcom,mount-angle = <0>;
		cam_vdig-supply = <&vph_pwr_vreg>;
		/* Cameras powered by PMIC: */
		cam_vio-supply = <&pm8994_s4>;
		cam_vana-supply = <&pm8994_l18>;
		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 3150000>;
		qcom,cam-vreg-max-voltage = <1000000 0 3600000>;
		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";
		@@ -213,7 +213,7 @@
		/* Cameras powered by PMIC: */
		cam_vdig-supply = <&vph_pwr_vreg>;
		cam_vio-supply = <&pm8994_lvs1>;
		cam_vana-supply = <&pm8994_l29>;
		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>;
		@@ -235,7 +235,7 @@
		"CAM_STANDBY2";
		qcom,sensor-position = <1>;
		qcom,sensor-mode = <0>;
		qcom,cci-master = <1>;
		qcom,cci-master = <0>;
		status = "ok";
		clocks = <&clock_mmss clk_mclk2_clk_src>,
		<&clock_mmss clk_camss_mclk2_clk>;

arch/arm/boot/dts/qcom/apq8096-drone-sensors.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -105,11 +105,11 @@
		pinctrl-names = "i2c_active", "i2c_sleep";
		pinctrl-0 = <&i2c_3_active>;
		pinctrl-1 = <&i2c_3_sleep>;
		status = "disabled";
		status = "ok";
		};

		i2c_7: i2c@75b5000 { /* BLSP2 QUP1 */
		status = "disabled";
		status = "ok";
		};

		blsp2_uart3: uart@075b1000 { /* HW-BLSP9 = BLSP2 UART3 */

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -371,7 +371,7 @@
		status = "okay";
		pm8994_l3: regulator-l3 {
		regulator-min-microvolt = <1100000>;
		regulator-max-microvolt = <1100000>;
		regulator-max-microvolt = <1300000>;
		qcom,init-voltage = <1100000>;
		status = "okay";
		};
		@@ -455,9 +455,9 @@
		rpm-regulator-ldoa22 {
		status = "okay";
		pm8994_l22: regulator-l22 {
		regulator-min-microvolt = <2800000>;
		regulator-max-microvolt = <2800000>;
		qcom,init-voltage = <2800000>;
		regulator-min-microvolt = <2500000>;
		regulator-max-microvolt = <2500000>;
		qcom,init-voltage = <2500000>;
		status = "okay";
		};
		};