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

Commit be407bff 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: Use pm8953_l2 as camera vdig supply"

parents 501cbe9e 552b590d

arch/arm/boot/dts/qcom/apq8053-camera-sensor-dragon.dtsi

+118 −12
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017, 2018 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -36,6 +36,109 @@ 
		qcom,cam-vreg-op-mode = <80000>;

	};



	eeprom0: qcom,eeprom@0 {

		cell-index = <0>;

		compatible = "qcom,eeprom";

		reg = <0x0>;

		qcom,cci-master = <0>;

		cam_vio-supply = <&pm8953_l6>;

		cam_vdig-supply = <&pm8953_l2>;

		cam_vana-supply = <&pm8953_l17>;

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

						"cam_vana";

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

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

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

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

		pinctrl-0 = <&cam_sensor_mclk0_default

				&cam_sensor_rear_default

				&cam_sensor_rear_vana>;

		pinctrl-1 = <&cam_sensor_mclk0_sleep &cam_sensor_rear_sleep

				&cam_sensor_rear_vana_sleep>;

		gpios = <&tlmm 26 0>,

			<&tlmm 40 0>,

			<&tlmm 39 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_MCLK0",

			"CAM_RESET0",

			"CAM_STANDBY0";

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

	};



	eeprom1: qcom,eeprom@1 {

		cell-index = <1>;

		compatible = "qcom,eeprom";

		reg = <0x1>;

		qcom,cci-master = <0>;

		cam_vio-supply = <&pm8953_l6>;

		cam_vdig-supply = <&pm8953_l2>;

		cam_vana-supply = <&pm8953_l17>;

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

						"cam_vana";

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

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

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

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

		pinctrl-0 = <&cam_sensor_mclk1_default

				&cam_sensor_front1_default>;

		pinctrl-1 = <&cam_sensor_mclk1_sleep

				&cam_sensor_front1_sleep>;

		gpios = <&tlmm 27 0>,

			<&tlmm 129 0>,

			<&tlmm 130 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";

		clocks = <&clock_gcc clk_mclk1_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk1_clk>;

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

		qcom,clock-rates = <24000000 0>;

	};



	eeprom2: qcom,eeprom@2 {

		cell-index = <2>;

		compatible = "qcom,eeprom";

		reg = <0x2>;

		qcom,cci-master = <0>;

		cam_vio-supply = <&pm8953_l6>;

		cam_vdig-supply = <&pm8953_l2>;

		cam_vana-supply = <&pm8953_l17>;

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

						"cam_vana";

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

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

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

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

		pinctrl-0 = <&cam_sensor_mclk2_default

				&cam_sensor_front_default>;

		pinctrl-1 = <&cam_sensor_mclk2_sleep

				&cam_sensor_front_sleep>;

		gpios = <&tlmm 28 0>,

			<&tlmm 131 0>,

			<&tlmm 132 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";

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

	};



	camera0: qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";
@@ -45,13 +148,14 @@ 
		qcom,mount-angle = <0>;

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

		qcom,actuator-src = <&actuator0>;

		qcom,eeprom-src = <&eeprom0>;

		cam_vio-supply = <&pm8953_l6>;

		cam_vdig-supply = <&eldo_cam0_vreg>;

		cam_vdig-supply = <&pm8953_l2>;

		cam_vana-supply = <&pm8953_l17>;

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

						"cam_vana";

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

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

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

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

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

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

		pinctrl-0 = <&cam_sensor_mclk0_default
@@ -86,14 +190,15 @@ 
		qcom,csiphy-sd-index = <1>;

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

		qcom,mount-angle = <0>;

		qcom,actuator-src = <&actuator1>;

		qcom,actuator-src = <&actuator0>;

		qcom,eeprom-src = <&eeprom1>;

		cam_vio-supply = <&pm8953_l6>;

		cam_vdig-supply = <&eldo_cam1_vreg>;

		cam_vdig-supply = <&pm8953_l2>;

		cam_vana-supply = <&pm8953_l17>;

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

						"cam_vana";

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

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

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

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

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

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

		pinctrl-0 = <&cam_sensor_mclk1_default
@@ -110,7 +215,7 @@ 
		qcom,gpio-req-tbl-label = "CAMIF_MCLK1",

			"CAM_RESET1",

			"CAM_STANDBY1";

		qcom,sensor-position = <0>;

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "ok";
@@ -128,13 +233,14 @@ 
		qcom,csid-sd-index = <2>;

		qcom,mount-angle = <0>;

		qcom,actuator-src = <&actuator0>;

		qcom,eeprom-src = <&eeprom2>;

		cam_vio-supply = <&pm8953_l6>;

		cam_vdig-supply = <&eldo_cam2_vreg>;

		cam_vdig-supply = <&pm8953_l2>;

		cam_vana-supply = <&pm8953_l17>;

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

						"cam_vana";

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

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

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

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

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

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

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

arch/arm/boot/dts/qcom/apq8053-lite-dragon.dtsi

+17 −0
Original line number Diff line number Diff line
@@ -173,6 +173,23 @@ 
	/delete-property/ qcom,msm-vdd-wsa-switch-current;

};



&pm8953_l2 {

	status = "okay";

	regulator-always-on;

};



&camera0 {

	qcom,mount-angle = <90>;

};



&camera1 {

	qcom,mount-angle = <90>;

};



&camera2{

	qcom,mount-angle = <90>;

};



&pm8953_diangu_dig {

	status = "ok";

};