summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorPeter Marheine <pmarheine@chromium.org>2022-11-14 13:13:50 +1100
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-11-29 01:05:08 +0000
commit57b32569630025bea009a13fc46d1354debe3fdc (patch)
tree8ceba06e674bbbcd60575e392b109d122e379c68 /board
parent1497d466220fc32f5d857883c4902a43c394059c (diff)
downloadchrome-ec-57b32569630025bea009a13fc46d1354debe3fdc.tar.gz
Rename CONFIG_CHARGER_INPUT_CURRENT to _CHARGER_DEFAULT_CURRENT_LIMIT
"Default input current" is not a very clear name, so rename this option to better express its use as a default value that is set in the charger. This is made possible by splitting other uses into CHARGER_MIN_INPUT_CURRENT_LIMIT, making the only use for CHARGER_INPUT_CURRENT be as a default. BUG=b:163093572 TEST=make buildall; zmake build -a BRANCH=none LOW_COVERAGE_REASON=isl9241 and sm5803 currently lack emulators Signed-off-by: Peter Marheine <pmarheine@chromium.org> Change-Id: Ia9c1df9061825b15477466e85343afeb2a371288 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4025404 Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com> Reviewed-by: Keith Short <keithshort@chromium.org>
Diffstat (limited to 'board')
-rw-r--r--board/atlas/board.h2
-rw-r--r--board/casta/board.c3
-rw-r--r--board/coral/board.h2
-rw-r--r--board/elm/board.h2
-rw-r--r--board/eve/board.h2
-rw-r--r--board/hammer/board.h2
-rw-r--r--board/host/charger.c3
-rw-r--r--board/mchpevb1/board.h2
-rw-r--r--board/nami/board.h2
-rw-r--r--board/nautilus/board.h2
-rw-r--r--board/nocturne/board.h2
-rw-r--r--board/oak/board.h2
-rw-r--r--board/poppy/board.h2
-rw-r--r--board/rammus/board.h2
-rw-r--r--board/reef/board.h2
-rw-r--r--board/reef_it8320/board.h2
-rw-r--r--board/reef_mchp/board.h2
-rw-r--r--board/scarlet/board.h2
18 files changed, 20 insertions, 18 deletions
diff --git a/board/atlas/board.h b/board/atlas/board.h
index f5cef8d582..3dbce640bb 100644
--- a/board/atlas/board.h
+++ b/board/atlas/board.h
@@ -77,7 +77,7 @@
#define CONFIG_CHARGER
#define CONFIG_CHARGER_ISL9238
#define CONFIG_CHARGER_DISCHARGE_ON_AC
-#define CONFIG_CHARGER_INPUT_CURRENT 512
+#define CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT 512
#define CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT 512
#define CONFIG_CHARGER_INPUT_CURRENT_DERATE_PCT 5
#define CONFIG_CHARGER_PROFILE_OVERRIDE
diff --git a/board/casta/board.c b/board/casta/board.c
index 512a7c224b..2ae65c7d86 100644
--- a/board/casta/board.c
+++ b/board/casta/board.c
@@ -172,7 +172,8 @@ static void set_input_limit_on_ac_removal(void)
if (get_cbi_ssfc_charger() != SSFC_CHARGER_BQ25710)
return;
- charger_set_input_current_limit(0, CONFIG_CHARGER_INPUT_CURRENT);
+ charger_set_input_current_limit(0,
+ CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT);
}
DECLARE_HOOK(HOOK_AC_CHANGE, set_input_limit_on_ac_removal, HOOK_PRIO_DEFAULT);
diff --git a/board/coral/board.h b/board/coral/board.h
index 9b45db2cf3..cea83ef4a5 100644
--- a/board/coral/board.h
+++ b/board/coral/board.h
@@ -60,7 +60,7 @@
#define CONFIG_CHARGER_BD9995X
#define CONFIG_CHARGER_BD9995X_CHGEN
#define CONFIG_CHARGER_DISCHARGE_ON_AC
-#define CONFIG_CHARGER_INPUT_CURRENT 512
+#define CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT 512
#define CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT 512
#define CONFIG_CHARGER_MAINTAIN_VBAT
#undef CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON
diff --git a/board/elm/board.h b/board/elm/board.h
index ba542754b5..6e4e705604 100644
--- a/board/elm/board.h
+++ b/board/elm/board.h
@@ -37,7 +37,7 @@
#define CONFIG_BATTERY_SMART
#define CONFIG_CHARGE_MANAGER
#define CONFIG_CHARGER
-#define CONFIG_CHARGER_INPUT_CURRENT 512
+#define CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT 512
#define CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT 512
#define CONFIG_CHARGE_RAMP_HW
#define CONFIG_CHARGER_ISL9237
diff --git a/board/eve/board.h b/board/eve/board.h
index b9de20896d..e3623979c3 100644
--- a/board/eve/board.h
+++ b/board/eve/board.h
@@ -100,7 +100,7 @@
#define CONFIG_CHARGER_BD9995X
#define CONFIG_CHARGER_BD9995X_CHGEN
#define CONFIG_CHARGER_DISCHARGE_ON_AC
-#define CONFIG_CHARGER_INPUT_CURRENT 512
+#define CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT 512
#define CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT 512
#define CONFIG_CHARGER_INPUT_CURRENT_DERATE_PCT 5
#define CONFIG_CHARGER_MAINTAIN_VBAT
diff --git a/board/hammer/board.h b/board/hammer/board.h
index ac6131798b..dd4b337c66 100644
--- a/board/hammer/board.h
+++ b/board/hammer/board.h
@@ -269,7 +269,7 @@
#ifdef BOARD_WAND
/* Battery and charger options. */
#define CONFIG_CHARGER
-#define CONFIG_CHARGER_INPUT_CURRENT 128
+#define CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT 128
#define CONFIG_CHARGER_ISL9238
#define CONFIG_CHARGER_SENSE_RESISTOR 10
#define CONFIG_CHARGER_SENSE_RESISTOR_AC 20
diff --git a/board/host/charger.c b/board/host/charger.c
index fddadf245d..0580ddcb41 100644
--- a/board/host/charger.c
+++ b/board/host/charger.c
@@ -136,7 +136,8 @@ static enum ec_error_list mock_set_input_current_limit(int chgnum, int current)
static enum ec_error_list mock_post_init(int chgnum)
{
- mock_current = mock_input_current = CONFIG_CHARGER_INPUT_CURRENT;
+ mock_current = mock_input_current =
+ CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT;
return EC_SUCCESS;
}
diff --git a/board/mchpevb1/board.h b/board/mchpevb1/board.h
index ae8982f939..dd7c87fd6f 100644
--- a/board/mchpevb1/board.h
+++ b/board/mchpevb1/board.h
@@ -150,7 +150,7 @@
/* #define CONFIG_CHARGER_DISCHARGE_ON_AC */
/* #define CONFIG_CHARGER_ISL9237 */
/* #define CONFIG_CHARGER_ILIM_PIN_DISABLED */
-/* #define CONFIG_CHARGER_INPUT_CURRENT 512 */
+/* #define CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT 512 */
/* #define CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT 512 */
/* #define CONFIG_CHARGER_NARROW_VDC */
diff --git a/board/nami/board.h b/board/nami/board.h
index 1a71e83c4f..652db4826d 100644
--- a/board/nami/board.h
+++ b/board/nami/board.h
@@ -96,7 +96,7 @@
#define CONFIG_CHARGER
#define CONFIG_CHARGER_ISL9238
#define CONFIG_CHARGER_DISCHARGE_ON_AC
-#define CONFIG_CHARGER_INPUT_CURRENT 512
+#define CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT 512
#define CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT 512
#define CONFIG_CHARGER_MIN_POWER_MW_FOR_POWER_ON 27000
#define CONFIG_CHARGER_MIN_POWER_MW_FOR_POWER_ON_WITH_BATT 15000
diff --git a/board/nautilus/board.h b/board/nautilus/board.h
index 882b5d74f4..2b4f25538d 100644
--- a/board/nautilus/board.h
+++ b/board/nautilus/board.h
@@ -79,7 +79,7 @@
#define CONFIG_CHARGER
#define CONFIG_CHARGER_ISL9238
#define CONFIG_CHARGER_DISCHARGE_ON_AC
-#define CONFIG_CHARGER_INPUT_CURRENT 512
+#define CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT 512
#define CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT 512
#define CONFIG_CHARGER_PROFILE_OVERRIDE
#define CONFIG_CHARGER_PSYS
diff --git a/board/nocturne/board.h b/board/nocturne/board.h
index 828c9a2087..73700b8480 100644
--- a/board/nocturne/board.h
+++ b/board/nocturne/board.h
@@ -70,7 +70,7 @@
#define CONFIG_CHARGE_MANAGER
#define CONFIG_CHARGER
#define CONFIG_CHARGER_DISCHARGE_ON_AC
-#define CONFIG_CHARGER_INPUT_CURRENT 128
+#define CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT 128
#define CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT 128
#define CONFIG_CHARGER_ISL9238
/*
diff --git a/board/oak/board.h b/board/oak/board.h
index ca9e16cf23..c429a655c5 100644
--- a/board/oak/board.h
+++ b/board/oak/board.h
@@ -40,7 +40,7 @@
#define CONFIG_CHARGE_MANAGER
#define CONFIG_CHARGER
-#define CONFIG_CHARGER_INPUT_CURRENT 512
+#define CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT 512
#define CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT 512
#if BOARD_REV == OAK_REV1
diff --git a/board/poppy/board.h b/board/poppy/board.h
index c06f96c438..5242c1d3a8 100644
--- a/board/poppy/board.h
+++ b/board/poppy/board.h
@@ -89,7 +89,7 @@
#define CONFIG_CHARGER
#define CONFIG_CHARGER_ISL9238
#define CONFIG_CHARGER_DISCHARGE_ON_AC
-#define CONFIG_CHARGER_INPUT_CURRENT 512
+#define CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT 512
#define CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT 472
#define CONFIG_CHARGER_PSYS
#define CONFIG_CHARGER_SENSE_RESISTOR 10
diff --git a/board/rammus/board.h b/board/rammus/board.h
index 2de783e247..975417df9a 100644
--- a/board/rammus/board.h
+++ b/board/rammus/board.h
@@ -84,7 +84,7 @@
#define CONFIG_CHARGER
#define CONFIG_CHARGER_ISL9238
#define CONFIG_CHARGER_DISCHARGE_ON_AC
-#define CONFIG_CHARGER_INPUT_CURRENT 512
+#define CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT 512
#define CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT 512
#define CONFIG_CHARGER_PSYS
#define CONFIG_CHARGER_SENSE_RESISTOR 10
diff --git a/board/reef/board.h b/board/reef/board.h
index 16f40c2f4a..cc1783e43a 100644
--- a/board/reef/board.h
+++ b/board/reef/board.h
@@ -50,7 +50,7 @@
#define CONFIG_CHARGER_BD9995X
#define CONFIG_CHARGER_BD9995X_CHGEN
#define CONFIG_CHARGER_DISCHARGE_ON_AC
-#define CONFIG_CHARGER_INPUT_CURRENT 512
+#define CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT 512
#define CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT 512
#define CONFIG_CHARGER_INPUT_CURRENT_DERATE_PCT 5
#define CONFIG_CHARGER_LIMIT_POWER_THRESH_BAT_PCT 1
diff --git a/board/reef_it8320/board.h b/board/reef_it8320/board.h
index 558b10152a..dbccc6eeee 100644
--- a/board/reef_it8320/board.h
+++ b/board/reef_it8320/board.h
@@ -48,7 +48,7 @@
#define CONFIG_CHARGER_BD9995X
#define CONFIG_CHARGER_BD9995X_CHGEN
#define CONFIG_CHARGER_DISCHARGE_ON_AC
-#define CONFIG_CHARGER_INPUT_CURRENT 512
+#define CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT 512
#define CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT 512
#define CONFIG_CHARGER_INPUT_CURRENT_DERATE_PCT 5
#define CONFIG_CHARGER_LIMIT_POWER_THRESH_BAT_PCT 1
diff --git a/board/reef_mchp/board.h b/board/reef_mchp/board.h
index d570f50142..925f271ffd 100644
--- a/board/reef_mchp/board.h
+++ b/board/reef_mchp/board.h
@@ -53,7 +53,7 @@
#define CONFIG_CHARGER_BD9995X
#define CONFIG_CHARGER_BD9995X_CHGEN
#define CONFIG_CHARGER_DISCHARGE_ON_AC
-#define CONFIG_CHARGER_INPUT_CURRENT 512
+#define CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT 512
#define CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT 512
#define CONFIG_CHARGER_INPUT_CURRENT_DERATE_PCT 5
#define CONFIG_CHARGER_LIMIT_POWER_THRESH_BAT_PCT 1
diff --git a/board/scarlet/board.h b/board/scarlet/board.h
index aba5819516..cdc09f9114 100644
--- a/board/scarlet/board.h
+++ b/board/scarlet/board.h
@@ -69,7 +69,7 @@
#define CONFIG_CHARGER
#define CONFIG_CHARGER_RT9467
-#define CONFIG_CHARGER_INPUT_CURRENT 512
+#define CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT 512
#define CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT 512
#define CONFIG_CHARGER_LIMIT_POWER_THRESH_BAT_PCT 2
#define CONFIG_CHARGER_LIMIT_POWER_THRESH_CHG_MW 15000
View Lorry Controller Status