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

Commit 603419fc authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: Enable smb1355 in defconfig"

parents 5a3cf79c 6126aff0

arch/arm64/configs/vendor/holi_GKI.config

+1 −0
Original line number Diff line number Diff line
@@ -204,3 +204,4 @@ CONFIG_INTERCONNECT_QCOM_CPUCP_L3=m 
CONFIG_SMB1398_CHARGER=m

CONFIG_QCOM_WDT_CORE=m

CONFIG_QCOM_SOC_WATCHDOG=m

CONFIG_SMB1355_SLAVE_CHARGER=m

drivers/power/supply/qcom/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ config SMB1398_CHARGER 


config SMB1355_SLAVE_CHARGER

	tristate "SMB1355 Slave Battery Charger"

	depends on MFD_I2C_PMIC

	depends on MFD_I2C_PMIC && IIO

	help

	  Say Y to include support for SMB1355 Battery Charger.

	  SMB1355 is a single phase 5A battery charger.

drivers/power/supply/qcom/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -6,5 +6,6 @@ obj-$(CONFIG_QPNP_QG) += qcom-qpnp-qg.o 
qcom-qpnp-qg-y	+= qpnp-qg.o battery-profile-loader.o pmic-voter.o qg-util.o qg-soc.o qg-sdam.o qg-battery-profile.o qg-profile-lib.o fg-alg.o

obj-$(CONFIG_SMB1398_CHARGER)           += qcom-smb1398-charger.o

qcom-smb1398-charger-y += smb1398-charger.o pmic-voter.o

obj-$(CONFIG_SMB1355_SLAVE_CHARGER)	+= smb1355-charger.o pmic-voter.o

obj-$(CONFIG_QPNP_SMBLITE)	        += step-chg-jeita.o battery.o qpnp-smblite.o smblite-lib.o pmic-voter.o storm-watch.o schgm-falshlite.o

obj-$(CONFIG_SMB1355_SLAVE_CHARGER)	+= qcom-smb1355-charger.o

qcom-smb1355-charger-y += smb1355-charger.o pmic-voter.o

drivers/power/supply/qcom/battery.c

+11 −9
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ enum { 
	PARALLEL_OUTPUT_MODE,

};



/* CP Channels */

static const char * const bat_cp_ext_iio_chan[] = {

	[BAT_CP_PARALLEL_MODE] = "parallel_mode",

	[BAT_CP_PARALLEL_OUTPUT_MODE] = "parallel_output_mode",
@@ -155,17 +156,18 @@ static const char * const bat_cp_ext_iio_chan[] = { 
	[BAT_CP_SWITCHER_EN] = "cp_switcher_en",

};



/* SMB1355 Channels */

static const char * const bat_smb_parallel_ext_iio_chan[] = {

	[BAT_SMB_PARALLEL_INPUT_SUSPEND] = "input_suspend",

	[BAT_SMB_PARALLEL_MODE] = "parallel_mode",

	[BAT_SMB_PARALLEL_BATFET_MODE] = "parallel_batfet_mode",

	[BAT_SMB_PARALLEL_MIN_ICL] = "min_icl",

	[BAT_SMB_PARALLEL_FCC_MAX] = "parallel_fcc_max",

	[BAT_SMB_PARALLEL_CURRENT_MAX] = "current_max",

	[BAT_SMB_PARALLEL_INPUT_SUSPEND] = "pl_input_suspend",

	[BAT_SMB_PARALLEL_MODE] = "pl_mode",

	[BAT_SMB_PARALLEL_BATFET_MODE] = "pl_batfet_mode",

	[BAT_SMB_PARALLEL_MIN_ICL] = "pl_min_icl",

	[BAT_SMB_PARALLEL_FCC_MAX] = "pl_fcc_max",

	[BAT_SMB_PARALLEL_CURRENT_MAX] = "pl_current_max",

	[BAT_SMB_PARALLEL_CONSTANT_CHARGE_CURRENT_MAX] =

			"constant_charge_current_max",

	[BAT_SMB_PARALLEL_VOLTAGE_MAX] = "voltage_max",

	[BAT_SMB_PARALLEL_CHARGE_TYPE] = "charge_type",

			"pl_constant_charge_current_max",

	[BAT_SMB_PARALLEL_VOLTAGE_MAX] = "pl_voltage_max",

	[BAT_SMB_PARALLEL_CHARGE_TYPE] = "pl_charge_type",

};



/*********

drivers/power/supply/qcom/smb1355-charger.c

+350 −227

File changed.

Preview size limit exceeded, changes collapsed.