7 files changed, 23 insertions, 28 deletions
diff --git a/common/battery.c b/common/battery.c
index a23b8c2505..0f528e97c6 100644
--- a/common/battery.c
+++ b/common/battery.c
@@ -608,3 +608,14 @@ void battery_compensate_params(struct batt_params *batt)
 	/* Rounding (instead of truncating) */
 	batt->display_charge = (numer + denom / 2) / denom;
 }
+
+__attribute__((weak)) int get_battery_manufacturer_name(char *dest, int size)
+{
+	strzcpy(dest, "<unkn>", size);
+	return EC_SUCCESS;
+}
+
+int battery_manufacturer_name(char *dest, int size)
+{
+	return get_battery_manufacturer_name(dest, size);
+}
diff --git a/driver/battery/bq27541.c b/driver/battery/bq27541.c
index 2731b908bf..392c74a05c 100644
--- a/driver/battery/bq27541.c
+++ b/driver/battery/bq27541.c
@@ -155,13 +155,6 @@ int battery_time_at_rate(int rate, int *minutes)
 	return bq27541_read(REG_AT_RATE_TIME_TO_EMPTY, minutes);
 }
 
-int battery_manufacturer_name(char *dest, int size)
-{
-	strzcpy(dest, "<unkn>", size);
-
-	return EC_SUCCESS;
-}
-
 int battery_device_chemistry(char *dest, int size)
 {
 	strzcpy(dest, "<unkn>", size);
diff --git a/driver/battery/bq27621_g1.c b/driver/battery/bq27621_g1.c
index c55d452c87..304fe67241 100644
--- a/driver/battery/bq27621_g1.c
+++ b/driver/battery/bq27621_g1.c
@@ -474,11 +474,6 @@ int battery_time_at_rate(int rate, int *minutes)
 	return EC_ERROR_UNIMPLEMENTED;
 }
 
-int battery_manufacturer_name(char *dest, int size)
-{
-	return EC_ERROR_UNIMPLEMENTED;
-}
-
 int battery_device_chemistry(char *dest, int size)
 {
 	uint32_t rv;
diff --git a/driver/battery/max17055.c b/driver/battery/max17055.c
index e549dcec3c..b022b24655 100644
--- a/driver/battery/max17055.c
+++ b/driver/battery/max17055.c
@@ -174,13 +174,6 @@ int battery_time_at_rate(int rate, int *minutes)
 	return EC_ERROR_UNIMPLEMENTED;
 }
 
-int battery_manufacturer_name(char *dest, int size)
-{
-	strzcpy(dest, "<unkn>", size);
-
-	return EC_SUCCESS;
-}
-
 int battery_device_chemistry(char *dest, int size)
 {
 	strzcpy(dest, "<unkn>", size);
diff --git a/driver/battery/mm8013.c b/driver/battery/mm8013.c
index c445bc42c6..012f3a25bd 100644
--- a/driver/battery/mm8013.c
+++ b/driver/battery/mm8013.c
@@ -116,13 +116,6 @@ int battery_time_at_rate(int rate, int *minutes)
 	return EC_ERROR_UNIMPLEMENTED;
 }
 
-int battery_manufacturer_name(char *dest, int size)
-{
-	strzcpy(dest, "<unkn>", size);
-
-	return EC_SUCCESS;
-}
-
 int battery_device_chemistry(char *dest, int size)
 {
 	strzcpy(dest, "<unkn>", size);
diff --git a/driver/battery/smart.c b/driver/battery/smart.c
index f06da84e9f..8138aada53 100644
--- a/driver/battery/smart.c
+++ b/driver/battery/smart.c
@@ -280,8 +280,7 @@ test_mockable int battery_manufacture_date(int *year, int *month, int *day)
 	return EC_SUCCESS;
 }
 
-/* Read manufacturer name */
-test_mockable int battery_manufacturer_name(char *dest, int size)
+int get_battery_manufacturer_name(char *dest, int size)
 {
 	return sb_read_string(SB_MANUFACTURER_NAME, dest, size);
 }
diff --git a/include/battery.h b/include/battery.h
index e3eec84164..df5aee5990 100644
--- a/include/battery.h
+++ b/include/battery.h
@@ -303,6 +303,17 @@ int battery_serial_number(int *serial);
 int battery_manufacturer_name(char *dest, int size);
 
 /**
+ * Read manufacturer name.
+ *
+ * This can be overridden to return a chip or board custom string.
+ *
+ * @param dest		Destination buffer.
+ * @param size		Length of destination buffer in chars.
+ * @return non-zero if error.
+ */
+int get_battery_manufacturer_name(char *dest, int size);
+
+/**
  * Read device name.
  *
  * @param dest		Destination buffer.