maxfg_logging: extending relaxation reporting data

Bug: 331503894
Bug: 331975257
Change-Id: I50fa58c710ebb30673c03a81c3ae9f13001c9a2b
Merged-In: I50fa58c710ebb30673c03a81c3ae9f13001c9a2b
Signed-off-by: Jenny Ho <[email protected]>
diff --git a/max1720x.h b/max1720x.h
index acd1f2e..116a11c 100644
--- a/max1720x.h
+++ b/max1720x.h
@@ -308,6 +308,22 @@
 	[MAX17X0X_TAG_avgr] = { ATOM_INIT_REG16(MAX1720X_NTTFCFG)},
 	[MAX17X0X_TAG_vfsoc] = { ATOM_INIT_REG16(MAX1720X_VFSOC)},
 	[MAX17X0X_TAG_vfocv] = { ATOM_INIT_REG16(MAX1720X_VFOCV)},
+	[MAXFG_TAG_fcnom] = { ATOM_INIT_REG16(MAX1720X_FULLCAPNOM)},
+	[MAXFG_TAG_fcrep] = { ATOM_INIT_REG16(MAX1720X_FULLCAPREP)},
+	[MAXFG_TAG_repsoc] = { ATOM_INIT_REG16(MAX1720X_REPSOC)},
+	[MAXFG_TAG_msoc] = { ATOM_INIT_REG16(MAX1720X_MIXSOC)},
+	[MAXFG_TAG_learn] = { ATOM_INIT_REG16(MAX1720X_LEARNCFG)},
+	[MAXFG_TAG_fstat] = { ATOM_INIT_REG16(MAX1720X_FSTAT)},
+	[MAXFG_TAG_dqacc] = { ATOM_INIT_REG16(MAX1720X_DQACC)},
+	[MAXFG_TAG_dpacc] = { ATOM_INIT_REG16(MAX1720X_DPACC)},
+	[MAXFG_TAG_avgt] = { ATOM_INIT_REG16(MAX1720X_AVGTA)},
+	[MAXFG_TAG_temp] = { ATOM_INIT_REG16(MAX1720X_TEMP)},
+	[MAXFG_TAG_qh] = { ATOM_INIT_REG16(MAX1720X_QH)},
+	[MAXFG_TAG_vcel] = { ATOM_INIT_REG16(MAX1720X_VCELL)},
+	[MAXFG_TAG_avgv] = { ATOM_INIT_REG16(MAX1720X_AVGVCELL)},
+	[MAXFG_TAG_vfocv] = { ATOM_INIT_REG16(MAX1720X_VFOCV)},
+	[MAXFG_TAG_rcomp0] = { ATOM_INIT_REG16(MAX1720X_RCOMP0)},
+	[MAXFG_TAG_tempco] = { ATOM_INIT_REG16(MAX1720X_TEMPCO)},
 
 	[MAX17X0X_TAG_BCNT] = { ATOM_INIT_MAP(0x8e, 0x8f, 0xb2, 0xb4, 0xc4,
 					      0xc5, 0xcd, 0xce, 0xd7, 0xdf) },
diff --git a/max1720x_battery.h b/max1720x_battery.h
index 403b992..ca9513f 100644
--- a/max1720x_battery.h
+++ b/max1720x_battery.h
@@ -78,6 +78,12 @@
 	MAXFG_TAG_rcomp0,
 	MAXFG_TAG_tempco,
 	MAXFG_TAG_fstat,
+	MAXFG_TAG_avgt,
+	MAXFG_TAG_temp,
+	MAXFG_TAG_qh,
+	MAXFG_TAG_vcel,
+	MAXFG_TAG_avgv,
+	MAXFG_TAG_vfocv,
 };
 
 enum max17x0x_reg_types {
diff --git a/max_m5.c b/max_m5.c
index 1c41862..597eba3 100644
--- a/max_m5.c
+++ b/max_m5.c
@@ -1604,6 +1604,9 @@
 	[MAXFG_TAG_fstat] = { ATOM_INIT_REG16(MAX_M5_FSTAT)},
 	[MAXFG_TAG_dqacc] = { ATOM_INIT_REG16(MAX_M5_DQACC)},
 	[MAXFG_TAG_dpacc] = { ATOM_INIT_REG16(MAX_M5_DPACC)},
+	[MAXFG_TAG_avgt] = { ATOM_INIT_REG16(MAX_M5_AVGTA)},
+	[MAXFG_TAG_avgv] = { ATOM_INIT_REG16(MAX_M5_AVGVCELL)},
+	[MAXFG_TAG_vfocv] = { ATOM_INIT_REG16(MAX_M5_VFOCV)},
 };
 
 int max_m5_regmap_init(struct max17x0x_regmap *regmap, struct i2c_client *clnt)
diff --git a/max_m5.h b/max_m5.h
index 00a65b5..3edc348 100644
--- a/max_m5.h
+++ b/max_m5.h
@@ -40,6 +40,7 @@
 #define MAX_M5_MODEL_ACCESS_LOCK_OK	0xFFFF
 
 #define MAX_M5_TCURVE	0xB9
+#define MAX_M5_VFOCV	0xFB
 #define MAX_M5_VFSOC	0xFF
 
 #define MAX_M5_COMMAND	0x60
diff --git a/maxfg_logging.c b/maxfg_logging.c
index 17f5a8b..c8a0143 100644
--- a/maxfg_logging.c
+++ b/maxfg_logging.c
@@ -11,7 +11,7 @@
 #include "maxfg_logging.h"
 
 /* learning parameters */
-#define MAX_FG_LEARNING_CONFIG_NORMAL_REGS 8
+#define MAX_FG_LEARNING_CONFIG_NORMAL_REGS 14
 #define MAX_FG_LEARNING_CONFIG_DEBUG_REGS 2
 
 /* see maxfg_ce_relaxed() */
@@ -25,6 +25,12 @@
 	MAXFG_TAG_msoc,
 	MAX17X0X_TAG_vfsoc,
 	MAXFG_TAG_fstat,
+	MAXFG_TAG_avgt,
+	MAXFG_TAG_temp,
+	MAXFG_TAG_qh,
+	MAXFG_TAG_vcel,
+	MAXFG_TAG_avgv,
+	MAXFG_TAG_vfocv,
 
 	/* from debug_regmap */
 	MAXFG_TAG_rcomp0,