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

Commit 38c1122c authored by Kui Wang's avatar Kui Wang Committed by Gerrit - the friendly Code Review server
Browse files

ARM: dts: msm: include camera dtsi for 8917 TMO 



Include camera related device dtsi for msm8917
TMO project. Add flash device node. Correct
power supply for rear sensor.

CRs-Fixed: 1060391

Change-Id: I48c8c71a168d0bfa06f3c66004d7620e08f0cd7d
Signed-off-by: default avatarKui Wang <kuiw@codeaurora.org>
Signed-off-by: default avatarLei Yuan <lyuan@codeaurora.org>
parent f3b722b2

arch/arm/boot/dts/qcom/msm8917-camera-sensor-tmo.dtsi

+39 −17
Original line number Diff line number Diff line
@@ -10,6 +10,25 @@ 
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */

&soc {

	led_flash0: qcom,camera-flash {

		cell-index = <0>;

		compatible = "qcom,camera-flash";

		qcom,flash-type = <1>;

		qcom,flash-source = <&pmi8937_flash0>;

		qcom,torch-source = <&pmi8937_torch0>;

		qcom,switch-source = <&pmi8937_switch>;

	};

};



&pm8917_l22{

	regulator-max-microvolt = <2850000>;

};



&pm8917_l23{

	regulator-max-microvolt = <1600000>;

};



&tlmm{

	cam_sensor_rear_vreg_default: cam_sensor_rear_vreg_default {

		/* VDIG */
@@ -42,12 +61,12 @@ 
	cam_sensor_front_vreg_default: cam_sensor_front_vreg_default {

		/* VDIG */

		mux {

			pins = "gpio96";

			pins = "gpio96","gpio68";

			function = "gpio";

		};



		config {

			pins = "gpio96";

			pins = "gpio96","gpio68";

			bias-disable; /* No PULL */

			drive-strength = <2>; /* 2 MA */

		};
@@ -56,12 +75,12 @@ 
	cam_sensor_front_vreg_sleep: cam_sensor_front_vreg_sleep {

		/* VDIG */

		mux {

			pins = "gpio96";

			pins = "gpio96","gpio68";

			function = "gpio";

		};



		config {

			pins = "gpio96";

			pins = "gpio96","gpio68";

			bias-disable; /* No PULL */

			drive-strength = <2>; /* 2 MA */

		};
@@ -74,7 +93,7 @@ 
		reg = <0x0>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

		cam_vaf-supply = <&pm8917_l17>;

		cam_vaf-supply = <&pm8917_l22>;

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

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

		qcom,cam-vreg-max-voltage = <2850000>;
@@ -91,14 +110,12 @@ 
		qcom,actuator-src = <&actuator0>;

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

		cam_vdig-supply = <&pm8917_l23>;

		cam_vana-supply = <&pm8917_l22>;

		cam_vio-supply = <&pm8917_l6>;

		cam_vaf-supply = <&pm8917_l17>;

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

							"cam_vaf";

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

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

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

		cam_vaf-supply = <&pm8917_l22>;

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

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

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

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

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk0_default

				&cam_sensor_rear_default
@@ -131,6 +148,7 @@ 
		clocks = <&clock_gcc clk_mclk0_clk_src>,

			<&clock_gcc clk_gcc_camss_mclk0_clk>;

		clock-names = "cam_src_clk", "cam_clk";

		qcom,clock-rates = <24000000 0>;

	};



	qcom,camera@2 {
@@ -144,8 +162,8 @@ 
		cam_vana-supply = <&pm8917_l22>;

		cam_vio-supply = <&pm8917_l6>;

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

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

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

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

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

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

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

		pinctrl-names = "cam_default", "cam_suspend";
@@ -158,15 +176,18 @@ 
		gpios = <&tlmm 28 0>,

			<&tlmm 40 0>,

			<&tlmm 39 0>,

			<&tlmm 68 0>,

			<&tlmm 96 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-vana = <3>;

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

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

		qcom,gpio-vio = <3>;

		qcom,gpio-vana = <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_MCLK2",

					  "CAM_RESET2",

					  "CAM_STANDBY2",

					  "CAM_GPIO_VIO",

					  "CAM_GPIO_VANA";

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <0>;
@@ -174,5 +195,6 @@ 
		clocks = <&clock_gcc clk_mclk2_clk_src>,

			<&clock_gcc clk_gcc_camss_mclk2_clk>;

		clock-names = "cam_src_clk", "cam_clk";

		qcom,clock-rates = <24000000 0>;

	};

};

arch/arm/boot/dts/qcom/msm8917-qgp-tmo.dtsi

+1 −3
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


#include "msm-pmi8937.dtsi"

#include "msm8917-qrd.dtsi"

#include "msm8917-camera-sensor-tmo.dtsi"

#include "msm8937-mdss-panels.dtsi"



&pmi_haptic {
@@ -89,9 +90,6 @@ 
			debounce-interval = <15>;

		};

	};



	led_flash0: qcom,camera-flash {

	};

};



&mdss_mdp {