diff --git a/drivers/power/sgm4154x_chg_mmi/Android.mk b/drivers/power/sgm4154x_chg_mmi/Android.mk index 0c242433913a..b8e82e0634d1 100644 --- a/drivers/power/sgm4154x_chg_mmi/Android.mk +++ b/drivers/power/sgm4154x_chg_mmi/Android.mk @@ -17,6 +17,10 @@ ifeq ($(MMI_SGM41513_CHARGER),true) KERNEL_CFLAGS += CONFIG_MMI_SGM41513_CHARGER=y endif +ifeq ($(MMI_QC3P_Z350_DETECTED),true) + KERNEL_CFLAGS += CONFIG_MMI_QC3P_Z350_DETECTED=y +endif + LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) LOCAL_ADDITIONAL_DEPENDENCIES := $(KERNEL_MODULES_OUT)/mmi_discrete_charger_class.ko diff --git a/drivers/power/sgm4154x_chg_mmi/Kbuild b/drivers/power/sgm4154x_chg_mmi/Kbuild index 2093274b8e5b..ec87bdb5a9ac 100644 --- a/drivers/power/sgm4154x_chg_mmi/Kbuild +++ b/drivers/power/sgm4154x_chg_mmi/Kbuild @@ -15,6 +15,10 @@ ifneq ($(filter m y,$(CONFIG_MMI_SGM41513_CHARGER)),) EXTRA_CFLAGS += -DCONFIG_MMI_SGM41513_CHARGER endif +ifneq ($(filter m y,$(CONFIG_MMI_QC3P_Z350_DETECTED)),) + EXTRA_CFLAGS += -DCONFIG_MMI_QC3P_Z350_DETECTED +endif + obj-m += sgm4154x_charger.o KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../mmi_discrete_charger/$(GKI_OBJ_MODULE_DIR)/Module.symvers diff --git a/drivers/power/sgm4154x_chg_mmi/sgm4154x_charger.h b/drivers/power/sgm4154x_chg_mmi/sgm4154x_charger.h index 43ac3d9b0f47..9e8a9be57b26 100644 --- a/drivers/power/sgm4154x_chg_mmi/sgm4154x_charger.h +++ b/drivers/power/sgm4154x_chg_mmi/sgm4154x_charger.h @@ -380,6 +380,18 @@ struct sgm4154x_device { #ifdef CONFIG_MMI_QC3P_WT6670_DETECTED enum WT_charger_type{ +#ifdef CONFIG_MMI_QC3P_Z350_DETECTED + WT_CHG_TYPE_OCP = 0, + WT_CHG_TYPE_FC = 0x1, + WT_CHG_TYPE_SDP = 0x2, + WT_CHG_TYPE_CDP = 0x3, + WT_CHG_TYPE_DCP = 0x4, + WT_CHG_TYPE_QC2 = 0x5, + WT_CHG_TYPE_QC3 = 0x6, + WT_CHG_TYPE_QC3P_18W = 0x8,//0x8 + WT_CHG_TYPE_QC3P_27W = 0x9, + WT6670_CHG_TYPE_UNKNOWN = 0x11, +#else WT_CHG_TYPE_BEGIN = 0, WT_CHG_TYPE_FC, WT_CHG_TYPE_SDP, @@ -391,6 +403,7 @@ enum WT_charger_type{ WT_CHG_TYPE_QC3P_18W,//0x8 WT_CHG_TYPE_QC3P_27W, WT6670_CHG_TYPE_UNKNOWN, +#endif }; enum mmi_qc3p_ext_iio_channels {