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

Commit f478e1ee 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: Enable charging functionalities for MSMGOLD SKU5"

parents 8562c3ab ef912eb8

arch/arm/boot/dts/qcom/msmgold-camera-sensor-qrd.dtsi

0 → 100644
+176 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016, 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */

&cci {

	actuator0: qcom,actuator@0 {

		cell-index = <0>;

		reg = <0x0>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

		cam_vaf-supply = <&pmgold_l17>;

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

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

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

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

	};



	eeprom0: qcom,eeprom@0 {

		cell-index = <0>;

		compatible = "qcom,eeprom";

		qcom,cci-master = <0>;

		reg = <0x0>;

		cam_vdig-supply = <&pmgold_l23>;

		cam_vana-supply = <&pmgold_l22>;

		cam_vio-supply = <&pmgold_l6>;

		cam_vaf-supply = <&pmgold_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>;

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

		pinctrl-0 = <&cam_sensor_mclk0_default

				&cam_sensor_rear_default>;

		pinctrl-1 = <&cam_sensor_mclk0_sleep &cam_sensor_rear_sleep>;

		gpios = <&tlmm 26 0>,

			<&tlmm 36 0>,

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

		status = "ok";

		clocks = <&clock_gcc clk_mclk0_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk0_clk>;

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

	};



	eeprom2: qcom,eeprom@2 {

		cell-index = <2>;

		compatible = "qcom,eeprom";

		reg = <0x02>;

		cam_vdig-supply = <&pmgold_l23>;

		cam_vana-supply = <&pmgold_l22>;

		cam_vio-supply = <&pmgold_l6>;

		cam_vaf-supply = <&pmgold_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 = <105000 0 80000 100000>;

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

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

		pinctrl-0 = <&cam_sensor_mclk2_default

					&cam_sensor_front1_default>;

		pinctrl-1 = <&cam_sensor_mclk2_sleep

					&cam_sensor_front1_sleep>;

		gpios = <&tlmm 28 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_MCLK2",

					  "CAM_RESET2",

					  "CAM_STANDBY2";

		qcom,cci-master = <0>;

		status = "ok";

		clocks = <&clock_gcc clk_mclk2_clk_src>,

			<&clock_gcc clk_gcc_camss_mclk2_clk>;

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

	};



	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";

		reg = <0x0>;

		qcom,csiphy-sd-index = <0>;

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

		qcom,mount-angle = <90>;

		qcom,actuator-src = <&actuator0>;

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

		qcom,eeprom-src = <&eeprom0>;

		cam_vdig-supply = <&pmgold_l23>;

		cam_vana-supply = <&pmgold_l22>;

		cam_vio-supply = <&pmgold_l6>;

		cam_vaf-supply = <&pmgold_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>;

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

		pinctrl-0 = <&cam_sensor_mclk0_default

				&cam_sensor_rear_default>;

		pinctrl-1 = <&cam_sensor_mclk0_sleep

				&cam_sensor_rear_sleep>;

		gpios = <&tlmm 26 0>,

			<&tlmm 36 0>,

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

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		clocks = <&clock_gcc clk_mclk0_clk_src>,

			<&clock_gcc clk_gcc_camss_mclk0_clk>;

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

	};



	qcom,camera@2 {

		cell-index = <2>;

		compatible = "qcom,camera";

		reg = <0x01>;

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

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

		qcom,eeprom-src = <&eeprom2>;

		qcom,mount-angle = <270>;

		cam_vdig-supply = <&pmgold_l23>;

		cam_vana-supply = <&pmgold_l22>;

		cam_vio-supply = <&pmgold_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-op-mode = <105000 0 80000>;

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

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

		pinctrl-0 = <&cam_sensor_mclk2_default

				&cam_sensor_front1_default>;

		pinctrl-1 = <&cam_sensor_mclk2_sleep

				&cam_sensor_front1_sleep>;

		gpios = <&tlmm 28 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_MCLK2",

					  "CAM_RESET2",

					  "CAM_STANDBY2";

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		clocks = <&clock_gcc clk_mclk2_clk_src>,

			<&clock_gcc clk_gcc_camss_mclk2_clk>;

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

	};

};

arch/arm/boot/dts/qcom/msmgold-pmi8937-qrd-sku5.dtsi

+36 −0
Original line number Diff line number Diff line
@@ -113,3 +113,39 @@ 
	status = "okay";

	qcom,actuator-type = "erm";

};



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

	};

};



/ {

	qrd_batterydata: qcom,battery-data {

		qcom,batt-id-range-pct = <15>;

		#include "batterydata-qrd-sku2-4v35-2590mah.dtsi"

	};

};



&pmi8937_charger {

	qcom,battery-data = <&qrd_batterydata>;

	qcom,float-voltage-mv = <4350>;

	qcom,chg-led-sw-controls;

	qcom,chg-led-support;

	status = "okay";

};



&pmi8937_fg {

	qcom,battery-data = <&qrd_batterydata>;

	qcom,cold-bat-decidegc = <(-100)>;

	qcom,cool-bat-decidegc = <(-100)>;

	qcom,hot-bat-decidegc = <550>;

	qcom,warm-bat-decidegc = <550>;

	qcom,bad-battery-detection-enable;

	qcom,hold-soc-while-full;

};

arch/arm/boot/dts/qcom/msmgold-qrd.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
 */



#include "msmgold-pinctrl.dtsi"

#include "msmgold-camera-sensor-qrd.dtsi"



&blsp1_uart2 {

	status = "ok";