From c2086f49d365ab412840bae90519542d3b9bc84f Mon Sep 17 00:00:00 2001
From: Qiong Xie <xieq2@motorola.com>
Date: Thu, 23 Dec 2021 04:46:05 -0600
Subject: [PATCH] Revert (CR):sgm4154x:add hawao vbus adc sample ratio

Revert "(CR):
sgm4154x:add hawao vbus adc sample ratio"

This reverts commit 3fa23f1771ca5bd9b1509823f8a52b160d2bf0f6.

Change-Id: I422474dd15250c8b99a81ab766a2d19c15f6d107
Reviewed-on: https://gerrit.mot.com/2153198
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Wang Wang <wangwang1@lenovo.com>
Submit-Approved: Jira Key
---
 drivers/power/sgm4154x_chg_mmi/Android.mk         |  4 ----
 drivers/power/sgm4154x_chg_mmi/Kbuild             |  4 ----
 drivers/power/sgm4154x_chg_mmi/sgm4154x_charger.c | 12 ------------
 3 files changed, 20 deletions(-)

diff --git a/drivers/power/sgm4154x_chg_mmi/Android.mk b/drivers/power/sgm4154x_chg_mmi/Android.mk
index 1a7c0e15ab60..c50411b9ae39 100644
--- a/drivers/power/sgm4154x_chg_mmi/Android.mk
+++ b/drivers/power/sgm4154x_chg_mmi/Android.mk
@@ -9,10 +9,6 @@ ifeq ($(MMI_QC3P_TURBO_CHARGER),true)
         KERNEL_CFLAGS += CONFIG_MMI_QC3P_TURBO_CHARGER=y
 endif
 
-ifeq ($(MMI_HAWAO_VBUS_SAMPLE_RATIO),true)
-        KERNEL_CFLAGS += CONFIG_MMI_HAWAO_VBUS_SAMPLE_RATIO=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 a7e0cc557337..9328f2d11429 100644
--- a/drivers/power/sgm4154x_chg_mmi/Kbuild
+++ b/drivers/power/sgm4154x_chg_mmi/Kbuild
@@ -7,10 +7,6 @@ ifneq ($(filter m y,$(CONFIG_MMI_QC3P_TURBO_CHARGER)),)
         EXTRA_CFLAGS += -DCONFIG_MMI_QC3P_TURBO_CHARGER
 endif
 
-ifneq ($(filter m y,$(CONFIG_MMI_HAWAO_VBUS_SAMPLE_RATIO)),)
-        EXTRA_CFLAGS += -DCONFIG_MMI_HAWAO_VBUS_SAMPLE_RATIO
-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.c b/drivers/power/sgm4154x_chg_mmi/sgm4154x_charger.c
index 8223df90047e..c90130c875f8 100644
--- a/drivers/power/sgm4154x_chg_mmi/sgm4154x_charger.c
+++ b/drivers/power/sgm4154x_chg_mmi/sgm4154x_charger.c
@@ -28,11 +28,6 @@
 static bool g_qc3p_detected = false;
 #endif
 
-#ifdef CONFIG_MMI_HAWAO_VBUS_SAMPLE_RATIO
-#define HAWAO_VBUS_ADC_PULL_UP_KOHM 180.0
-#define HAWAO_VBUS_ADC_PULL_DOWN_KOHM 39.0
-#endif
-
 static struct power_supply_desc sgm4154x_power_supply_desc;
 
 /* SGM4154x REG06 BOOST_LIM[5:4], uV */
@@ -50,7 +45,6 @@ static const unsigned int BOOST_CURRENT_LIMIT[] = {
 };
 #endif
 
-
 enum SGM4154x_VREG_FT {
 	VREG_FT_DISABLE,
 	VREG_FT_UP_8mV,
@@ -309,8 +303,6 @@ static int sgm4154x_read_usbin_voltage_chan(struct sgm4154x_device *sgm, int *va
 		return rc;
 	}
 
-	dev_info(sgm->dev, "vbus raw voltage = %d\n", *val);
-
 	return 0;
 }
 
@@ -325,11 +317,7 @@ static int sgm4154x_get_usb_voltage_now(struct sgm4154x_device *sgm, int *val)
 		return rc;
 	}
 
-#ifdef CONFIG_MMI_HAWAO_VBUS_SAMPLE_RATIO
-        *val = (int)(raw_date * (float)((HAWAO_VBUS_ADC_PULL_UP_KOHM + HAWAO_VBUS_ADC_PULL_DOWN_KOHM)/HAWAO_VBUS_ADC_PULL_DOWN_KOHM));
-#else
 	*val = raw_date * 3;
-#endif
 
 	return 0;
 }