diff --git a/drivers/power/cps4019_wls_charger/Kbuild b/drivers/power/cps4019_wls_charger/Kbuild
index 2ed4ba693d80..d427e8a8df92 100644
--- a/drivers/power/cps4019_wls_charger/Kbuild
+++ b/drivers/power/cps4019_wls_charger/Kbuild
@@ -5,4 +5,4 @@ EXTRA_CFLAGS += -I$(ANDROID_BUILD_TOP)/motorola/kernel/drivers/power/cps4019_wls
 
 obj-m += cps4019_wls_charger.o
 
-KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../../mmi_info/$(GKI_OBJ_MODULE_DIR)/Module.symvers
+KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../mmi_discrete_charger/$(GKI_OBJ_MODULE_DIR)/Module.symvers
diff --git a/drivers/power/cps4019_wls_charger/cps4019_wls_charger.c b/drivers/power/cps4019_wls_charger/cps4019_wls_charger.c
index b918574e1677..bd9d21096951 100644
--- a/drivers/power/cps4019_wls_charger/cps4019_wls_charger.c
+++ b/drivers/power/cps4019_wls_charger/cps4019_wls_charger.c
@@ -49,7 +49,7 @@
 #include <linux/mmi_wake_lock.h>
 #endif
 
-#include <soc/qcom/mmi_boot_info.h>
+#include <linux/mmi_discrete_charger_class.h>
 
 #include "cps4019_wls_charger.h"
 #include "cps4019_bl.h"
@@ -131,6 +131,10 @@ struct cps_wls_chrg_chip {
 	int rx_neg_protocol;
 	int command_flag;
 
+	/*main charger*/
+	const char *main_charger_name;
+	struct charger_device *main_chg_dev;
+
 	/*fw relative*/
 	const char *wls_fw_name;
 	int fw_ver_major;
@@ -194,6 +198,8 @@ static const struct regmap_config cps4019_regmap_32bit_config = {
 	.val_bits = 8,
 };
 
+extern bool mmi_is_factory_mode(void);
+
 static int cps_wls_get_int_flag(void);
 static int cps_wls_set_int_clr(int value);
 static int cps_wls_get_chip_id(void);
@@ -524,37 +530,6 @@ static int cps_set_power(bool en)
 	return CPS_WLS_SUCCESS;
 }
 
-static bool mmi_is_factory_mode(void)
-{
-	struct device_node *np = of_find_node_by_path("/chosen");
-	bool factory_mode = false;
-	const char *bootargs = NULL;
-	char *bootmode = NULL;
-	char *end = NULL;
-
-	if (!strncmp(bi_bootmode(), "mot-factory", 11))
-		return true;
-
-	if (!np)
-		return factory_mode;
-
-	if (!of_property_read_string(np, "bootargs", &bootargs)) {
-		bootmode = strstr(bootargs, "androidboot.mode=");
-		if (bootmode) {
-			end = strpbrk(bootmode, " ");
-			bootmode = strpbrk(bootmode, "=");
-		}
-		if (bootmode &&
-		    end > bootmode &&
-		    strnstr(bootmode, "factory", end - bootmode)) {
-				factory_mode = true;
-		}
-	}
-	of_node_put(np);
-
-	return factory_mode;
-}
-
 static int fp_size(struct file *f)
 {
 	int error = -EBADF;
@@ -1368,6 +1343,9 @@ static int cps_wls_parse_dt(struct cps_wls_chrg_chip *chip)
 		return -EINVAL;
 	}
 
+	chip->main_charger_name = NULL;
+	of_property_read_string(node, "main-charger-name", &chip->main_charger_name);
+
 	chip->fw_ver_major = 0;
 	chip->fw_ver_minor = 0;
 	of_property_read_u32(node, "fw_ver_major", &chip->fw_ver_major);
@@ -1529,6 +1507,13 @@ static int cps_wls_chrg_probe(struct i2c_client *client,
 	}
 	cps_wls_lock_work_init(chip);
 
+	if (chip->main_charger_name) {
+		chip->main_chg_dev = get_charger_by_name(chip->main_charger_name);
+		if (!chip->main_chg_dev) {
+			cps_wls_log(chip, "*** Error : can't find main charger %s***\n", chip->main_charger_name);
+		}
+	}
+
 	cps_wls_create_device_node(&(client->dev));
 
 	chip->otg_channel = devm_iio_channel_get(chip->dev, "otg_enable");