diff --git a/drivers/power/mmi_parallel_charger/mmi_charger_core.h b/drivers/power/mmi_parallel_charger/mmi_charger_core.h index 0b88d990e68b..4c7b435ce3fb 100644 --- a/drivers/power/mmi_parallel_charger/mmi_charger_core.h +++ b/drivers/power/mmi_parallel_charger/mmi_charger_core.h @@ -74,6 +74,15 @@ enum print_reason { PR_MOTO = BIT(7), }; +enum { + POWER_SUPPLY_CHARGE_RATE_NONE = 0, + POWER_SUPPLY_CHARGE_RATE_NORMAL, + POWER_SUPPLY_CHARGE_RATE_WEAK, + POWER_SUPPLY_CHARGE_RATE_TURBO, + POWER_SUPPLY_CHARGE_RATE_TURBO_30W, + POWER_SUPPLY_CHARGE_RATE_HYPER, +}; + static inline void wakeup_source_init_internal(struct wakeup_source *ws, const char *name) { diff --git a/drivers/power/qpnp-smbcharger-mmi/Android.mk b/drivers/power/qpnp-smbcharger-mmi/Android.mk index 35ff12fe93bd..ad3d320a2b9a 100755 --- a/drivers/power/qpnp-smbcharger-mmi/Android.mk +++ b/drivers/power/qpnp-smbcharger-mmi/Android.mk @@ -5,6 +5,10 @@ ifeq ($(MOTO_PD_CHARGER),true) KERNEL_CFLAGS += CONFIG_PD_CHARGER_MMI=y endif +ifeq ($(BQ2597X_DUAL_ENABLE),true) + KERNEL_CFLAGS += CONFIG_BQ2597X_DUAL=y +endif + include $(CLEAR_VARS) LOCAL_MODULE := qpnp-smbcharger-mmi.ko LOCAL_MODULE_TAGS := optional diff --git a/drivers/power/qpnp-smbcharger-mmi/Kbuild b/drivers/power/qpnp-smbcharger-mmi/Kbuild index 8906bafe9fea..149850849b04 100755 --- a/drivers/power/qpnp-smbcharger-mmi/Kbuild +++ b/drivers/power/qpnp-smbcharger-mmi/Kbuild @@ -6,4 +6,8 @@ ifneq ($(filter m y,$(CONFIG_PD_CHARGER_MMI)),) EXTRA_CFLAGS += -DCONFIG_PD_CHARGER_MMI endif +ifneq ($(filter m y, $(CONFIG_BQ2597X_DUAL)),) + EXTRA_CFLAGS += -DCONFIG_BQ2597X_DUAL +endif + obj-m += qpnp-smbcharger-mmi.o diff --git a/drivers/power/qpnp-smbcharger-mmi/qpnp-smbcharger-mmi.c b/drivers/power/qpnp-smbcharger-mmi/qpnp-smbcharger-mmi.c index 38315137c796..4f210142cfb4 100755 --- a/drivers/power/qpnp-smbcharger-mmi/qpnp-smbcharger-mmi.c +++ b/drivers/power/qpnp-smbcharger-mmi/qpnp-smbcharger-mmi.c @@ -207,12 +207,14 @@ enum { DISABLE_CHARGE_V5, }; +#ifndef CONFIG_BQ2597X_DUAL enum { POWER_SUPPLY_CHARGE_RATE_NONE = 0, POWER_SUPPLY_CHARGE_RATE_NORMAL, POWER_SUPPLY_CHARGE_RATE_WEAK, POWER_SUPPLY_CHARGE_RATE_TURBO, }; +#endif enum { CHG_BC1P2_SDP = 0,