adlrvp: Reconfigure battery to 2s based at runtime

Default battery configuration for ADL-P based sku is
3S based. Reconfiguration to 2s based battery configuration
at runtime for ADL M/N based RVPs can help in enabling single
binary for all ADL based skus, irrespective of it's
differences.

BUG=b:194163586
BRANCH=none
TEST=verified on ADL-P,M&N to get correct battery info

Signed-off-by: poornima tom <poornima.tom@intel.com>
Change-Id: I94eb45dbae7ad8c67e2aa6f0142e166a22ad1a0b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3220899
Reviewed-by: Vijay P Hiremath <vijay.p.hiremath@intel.com>
Reviewed-by: Keith Short <keithshort@chromium.org>

5 files changed, 74 insertions, 56 deletions

diff --git a/baseboard/intelrvp/adlrvp.c b/baseboard/intelrvp/adlrvp.c
index 8ec1b820b2..b2f12fbd7e 100644
--- a/baseboard/intelrvp/adlrvp.c
+++ b/baseboard/intelrvp/adlrvp.c
@@ -5,6 +5,7 @@
 
 /* Intel ADLRVP board-specific common configuration */
 
+#include "battery_fuel_gauge.h"
 #include "charger.h"
 #include "bq25710.h"
 #include "common.h"
@@ -388,6 +389,28 @@ static void configure_retimer_usbmux(void)
 	}
 }
 
+static void configure_battery_type(void)
+{
+	int bat_cell_type;
+
+	switch (ADL_RVP_BOARD_ID(board_get_version())) {
+	case ADLM_LP4_RVP1_SKU_BOARD_ID:
+	case ADLM_LP5_RVP2_SKU_BOARD_ID:
+	case ADLM_LP5_RVP3_SKU_BOARD_ID:
+	case ADLN_LP5_ERB_SKU_BOARD_ID:
+	case ADLN_LP5_RVP_SKU_BOARD_ID:
+		/* configure Battery to 2S based */
+		bat_cell_type = BATTERY_GETAC_SMP_HHP_408_2S;
+		break;
+	default:
+		/* configure Battery to 3S based */
+		bat_cell_type = BATTERY_GETAC_SMP_HHP_408_3S;
+		break;
+	}
+
+	/* Set the fixed battery type */
+	battery_set_fixed_battery_type(bat_cell_type);
+}
 /******************************************************************************/
 /* PWROK signal configuration */
 /*
@@ -483,4 +506,7 @@ __override void board_pre_task_i2c_peripheral_init(void)
 
 	/* Configure board specific retimer & mux */
 	configure_retimer_usbmux();
+
+	/* Configure battery type */
+	configure_battery_type();
 }
diff --git a/baseboard/intelrvp/adlrvp.h b/baseboard/intelrvp/adlrvp.h
index 4edc9a9da3..c85f2633c7 100644
--- a/baseboard/intelrvp/adlrvp.h
+++ b/baseboard/intelrvp/adlrvp.h
@@ -15,6 +15,9 @@
 
 /* RVP Board ids */
 #define CONFIG_BOARD_VERSION_GPIO
+#define ADLM_LP4_RVP1_SKU_BOARD_ID	0x01
+#define ADLM_LP5_RVP2_SKU_BOARD_ID	0x02
+#define ADLM_LP5_RVP3_SKU_BOARD_ID	0x03
 #define ADLN_LP5_ERB_SKU_BOARD_ID	0x06
 #define ADLN_LP5_RVP_SKU_BOARD_ID	0x07
 #define ADLP_DDR5_RVP_SKU_BOARD_ID	0x12
@@ -155,6 +158,9 @@
 #define CONFIG_BATTERY_COUNT	1
 #define CONFIG_HOSTCMD_BATTERY_V2
 
+/* Config to indicate battery type doesn't auto detect */
+#define CONFIG_BATTERY_TYPE_NO_AUTO_DETECT
+
 #ifndef __ASSEMBLER__
 
 enum adlrvp_charge_ports {
@@ -186,7 +192,8 @@ enum ioex_port {
 #define CONFIG_IO_EXPANDER_PORT_COUNT IOEX_PORT_COUNT
 
 enum battery_type {
-	BATTERY_GETAC_SMP_HHP_408,
+	BATTERY_GETAC_SMP_HHP_408_3S,
+	BATTERY_GETAC_SMP_HHP_408_2S,
 	BATTERY_TYPE_COUNT,
 };
 
diff --git a/baseboard/intelrvp/adlrvp_battery3s.c b/baseboard/intelrvp/adlrvp_battery.c
index 612a542aea..e5bf95827e 100644
--- a/baseboard/intelrvp/adlrvp_battery3s.c
+++ b/baseboard/intelrvp/adlrvp_battery.c
@@ -1,4 +1,4 @@
-/* Copyright 2020 The Chromium OS Authors. All rights reserved.
+/* Copyright 2021 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
@@ -10,18 +10,22 @@
 #include "common.h"
 #include "util.h"
 
+#ifdef CONFIG_BATTERY_TYPE_NO_AUTO_DETECT
+/* Battery configuration */
 const struct board_batt_params board_battery_info[] = {
 	/*
+	 * 3S based battery configuration
 	 * Getac Battery (Getac SMP-HHP-408) Information
 	 * Fuel gauge: BQ40Z50-R3
 	 */
-	[BATTERY_GETAC_SMP_HHP_408] = {
+	[BATTERY_GETAC_SMP_HHP_408_3S] = {
 		.fuel_gauge = {
 			.manuf_name = "Getac",
 			.ship_mode = {
 				.reg_addr = 0x00,
 				.reg_data = { 0x0010, 0x0010 },
 			},
+
 			.fet = {
 				.reg_addr = 0x0,
 				.reg_mask = 0x6000,
@@ -41,7 +45,39 @@ const struct board_batt_params board_battery_info[] = {
 			.discharging_max_c = 60,
 		},
 	},
+	/*
+	 * 2S based battery configuration
+	 * Getac Battery (Getac SMP-HHP-408) Information
+	 * Fuel gauge: BQ40Z50-R3
+	 */
+	[BATTERY_GETAC_SMP_HHP_408_2S] = {
+		.fuel_gauge = {
+			.manuf_name = "Getac",
+			.ship_mode = {
+				.reg_addr = 0x00,
+				.reg_data = { 0x0010, 0x0010 },
+			},
+			.fet = {
+				.reg_addr = 0x0,
+				.reg_mask = 0x6000,
+				.disconnect_val = 0x6000,
+			}
+		},
+		.batt_info = {
+			.voltage_max = 8800,        /* mV */
+			.voltage_normal = 7700,
+			.voltage_min = 6000,
+			.precharge_current = 256,   /* mA */
+			.start_charging_min_c = 0,
+			.start_charging_max_c = 45,
+			.charging_min_c = 0,
+			.charging_max_c = 45,
+			.discharging_min_c = 0,
+			.discharging_max_c = 60,
+		},
+	},
 };
 BUILD_ASSERT(ARRAY_SIZE(board_battery_info) == BATTERY_TYPE_COUNT);
 
-const enum battery_type DEFAULT_BATTERY_TYPE = BATTERY_GETAC_SMP_HHP_408;
+const enum battery_type DEFAULT_BATTERY_TYPE = BATTERY_GETAC_SMP_HHP_408_3S;
+#endif /* CONFIG_BATTERY_TYPE_NO_AUTO_DETECT */
diff --git a/baseboard/intelrvp/adlrvp_battery2s.c b/baseboard/intelrvp/adlrvp_battery2s.c
deleted file mode 100644
index 84465426e3..0000000000
--- a/baseboard/intelrvp/adlrvp_battery2s.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2020 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- * Battery pack vendor provided charging profile
- */
-
-#include "battery_fuel_gauge.h"
-#include "battery_smart.h"
-#include "common.h"
-#include "util.h"
-
-const struct board_batt_params board_battery_info[] = {
-	/*
-	 * Getac Battery (Getac SMP-HHP-408) Information
-	 * Fuel gauge: BQ40Z50-R3
-	 */
-	[BATTERY_GETAC_SMP_HHP_408] = {
-		.fuel_gauge = {
-			.manuf_name = "Getac",
-			.ship_mode = {
-				.reg_addr = 0x00,
-				.reg_data = { 0x0010, 0x0010 },
-			},
-			.fet = {
-				.reg_addr = 0x0,
-				.reg_mask = 0x6000,
-				.disconnect_val = 0x6000,
-			}
-		},
-		.batt_info = {
-			.voltage_max = 8800,        /* mV */
-			.voltage_normal = 7700,
-			.voltage_min = 6000,
-			.precharge_current = 256,   /* mA */
-			.start_charging_min_c = 0,
-			.start_charging_max_c = 45,
-			.charging_min_c = 0,
-			.charging_max_c = 45,
-			.discharging_min_c = 0,
-			.discharging_max_c = 60,
-		},
-	},
-};
-BUILD_ASSERT(ARRAY_SIZE(board_battery_info) == BATTERY_TYPE_COUNT);
-
-const enum battery_type DEFAULT_BATTERY_TYPE = BATTERY_GETAC_SMP_HHP_408;
diff --git a/baseboard/intelrvp/build.mk b/baseboard/intelrvp/build.mk
index 6abf8bbe0c..9f92896cfc 100644
--- a/baseboard/intelrvp/build.mk
+++ b/baseboard/intelrvp/build.mk
@@ -31,9 +31,5 @@ ifneq ($(filter y,$(BOARD_ADLRVPP_ITE) $(BOARD_ADLRVPM_ITE) \
 		$(BOARD_ADLRVPP_MCHP1521) $(BOARD_ADLRVPP_NPCX) \
 		$(BOARD_ADLRVPP_MCHP1727)),)
 baseboard-y+=adlrvp.o
-ifneq ($(BOARD_ADLRVPM_ITE),)
-baseboard-$(CONFIG_BATTERY_SMART)+=adlrvp_battery2s.o
-else
-baseboard-$(CONFIG_BATTERY_SMART)+=adlrvp_battery3s.o
-endif
+baseboard-$(CONFIG_BATTERY_SMART)+=adlrvp_battery.o
 endif