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

Commit 95a1f463 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 SMB1358 parallel-charger for APQ TITANIUM"

parents 0e217d02 c0be3ff6

Documentation/devicetree/bindings/power/smb135x-charger.txt

+4 −0
Original line number Diff line number Diff line
@@ -75,6 +75,10 @@ Optional Properties: 
				The possible range for fastcharge current is

				from 300mA to 3000mA.

- qcom,id-line-not-connected:	Specifies if smb135x charger is not monitoring the USB_ID line.

- qcom,parallel-en-pin-polarity Specify the polarity of enable signal controlled

				via pin in a parallel-charger configuration.

				0 - Active low and 1  - Active high.

				If not specified the default value is active-low.



Example:

	i2c@f9967000 {

arch/arm/boot/dts/qcom/apqtitanium-mtp.dts

+18 −1
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2015-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
@@ -21,3 +21,20 @@ 
	compatible = "qcom,apqtitanium-mtp", "qcom,apqtitanium", "qcom,mtp";

	qcom,board-id= <8 0>;

};



&i2c_2 {

	/* Parallel-charger configuration */

	smb135x-charger@1c {

		compatible = "qcom,smb1358-charger";

		reg = <0x1c>;

		qcom,parallel-en-pin-polarity = <1>;

		qcom,parallel-charger;

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

		qcom,recharge-mv = <100>;

	};

};



&pmi8950_fg {

	/* use external rsense for parallel charging */

	qcom,ext-sense-type;

};

arch/arm/configs/msm8937-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -318,6 +318,8 @@ CONFIG_PINCTRL_MSMTITANIUM=y 
CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_QPNP_PIN=y

CONFIG_POWER_SUPPLY=y

CONFIG_SMB1351_USB_CHARGER=y

CONFIG_SMB135X_CHARGER=y

CONFIG_QPNP_SMBCHARGER=y

CONFIG_QPNP_FG=y

CONFIG_BATTERY_BCL=y

arch/arm/configs/msm8937_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -319,6 +319,8 @@ CONFIG_DEBUG_GPIO=y 
CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_QPNP_PIN=y

CONFIG_POWER_SUPPLY=y

CONFIG_SMB1351_USB_CHARGER=y

CONFIG_SMB135X_CHARGER=y

CONFIG_QPNP_SMBCHARGER=y

CONFIG_QPNP_FG=y

CONFIG_BATTERY_BCL=y

arch/arm64/configs/msm8937-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -323,6 +323,7 @@ CONFIG_PINCTRL_MSMTITANIUM=y 
CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_QPNP_PIN=y

CONFIG_SMB1351_USB_CHARGER=y

CONFIG_SMB135X_CHARGER=y

CONFIG_QPNP_SMBCHARGER=y

CONFIG_QPNP_FG=y

CONFIG_BATTERY_BCL=y