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

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

Merge "power: supply: smb1390: Add support to make SMB1390 driver GKI compliant"

parents a16d8feb 13068207

drivers/power/supply/qcom/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ config SMB1355_SLAVE_CHARGER 


config SMB1390_CHARGE_PUMP_PSY

	tristate "SMB1390 power supply framework based driver"

	depends on MFD_I2C_PMIC

	depends on MFD_I2C_PMIC && IIO

	help

	  Say Y to include support for SMB1390 Charge Pump driver based on

	  power supply framework.

drivers/power/supply/qcom/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -10,6 +10,6 @@ obj-$(CONFIG_QPNP_SMBLITE) += qpnp-smblite-main.o 
qpnp-smblite-main-y += step-chg-jeita.o battery.o qpnp-smblite.o smblite-lib.o pmic-voter.o storm-watch.o battery-profile-loader.o schgm-flashlite.o smblite-iio.o

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

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

obj-$(CONFIG_SMB1390_CHARGE_PUMP_PSY)	+= smb1390-charger-psy.o pmic-voter.o

obj-$(CONFIG_SMB1351_USB_CHARGER)	+= smb1351-charger.o

obj-$(CONFIG_SMB358_CHARGER)    += smb358-charger.o
 
obj-$(CONFIG_SMB1351_USB_CHARGER)	+= smb1351-charger.o pmic-voter.o battery.o

obj-$(CONFIG_SMB1390_CHARGE_PUMP_PSY)   += qcom-smb1390-charger.o

qcom-smb1390-charger-y += smb1390-charger-psy.o pmic-voter.o

drivers/power/supply/qcom/smb1390-charger-psy.c

+671 −375

File changed.

Preview size limit exceeded, changes collapsed.