OCPC: Add concept of active charger IC

With OCPC, one charger IC per Type-C port, there are now multiple
charger ICs present in the system.  This commit adds the beginning of
OCPC support by adding the notion of an active charger IC.  Charge
Manager will select the active charger IC based upon the charge port.
Boards must define this mapping in a board specific function.

Additionally, this commit adds chgnum as a parameter to
charger_set_input_current_limit().

BUG=b:148981052
BRANCH=None
TEST=With other patches, verify that the active charger IC is able to
be saved and retrieved.

Change-Id: Iba4a8958171ad6e1630b0ca3d07d128bc1f2c4dd
Signed-off-by: Aseda Aboagye <aaboagye@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2135963
Tested-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Diana Z <dzigterman@chromium.org>
Commit-Queue: Aseda Aboagye <aaboagye@chromium.org>

9 files changed, 10 insertions, 9 deletions

diff --git a/board/atlas/board.c b/board/atlas/board.c
index 82dc847623..8948207c24 100644
--- a/board/atlas/board.c
+++ b/board/atlas/board.c
@@ -531,7 +531,8 @@ static int charger_derate(int current)
 
 static void board_charger_init(void)
 {
-	charger_set_input_current(charger_derate(PD_MAX_CURRENT_MA));
+	charger_set_input_current(CHARGER_SOLO, charger_derate
+				  (PD_MAX_CURRENT_MA));
 }
 DECLARE_HOOK(HOOK_INIT, board_charger_init, HOOK_PRIO_DEFAULT);
 
diff --git a/board/damu/board.c b/board/damu/board.c
index 4f5ce743b4..dab8e8684a 100644
--- a/board/damu/board.c
+++ b/board/damu/board.c
@@ -209,7 +209,7 @@ int board_set_active_charge_port(int charge_port)
 		 * even when battery is disconnected, keep VBAT rail on but
 		 * set the charging current to minimum.
 		 */
-		charger_set_current(0);
+		charger_set_current(CHARGER_SOLO, 0);
 		break;
 	default:
 		panic("Invalid charge port\n");
diff --git a/board/flapjack/board.c b/board/flapjack/board.c
index e0aed97417..f15f927840 100644
--- a/board/flapjack/board.c
+++ b/board/flapjack/board.c
@@ -347,7 +347,7 @@ int board_set_active_charge_port(int charge_port)
 		 * even when battery is disconnected, keep VBAT rail on but
 		 * set the charging current to minimum.
 		 */
-		charger_set_current(0);
+		charger_set_current(CHARGER_SOLO, 0);
 		break;
 	default:
 		panic("Invalid charge port\n");
diff --git a/board/jacuzzi/board.c b/board/jacuzzi/board.c
index 186b6ae934..101a80222b 100644
--- a/board/jacuzzi/board.c
+++ b/board/jacuzzi/board.c
@@ -211,7 +211,7 @@ int board_set_active_charge_port(int charge_port)
 		 * even when battery is disconnected, keep VBAT rail on but
 		 * set the charging current to minimum.
 		 */
-		charger_set_current(0);
+		charger_set_current(CHARGER_SOLO, 0);
 		break;
 	default:
 		panic("Invalid charge port\n");
diff --git a/board/kakadu/board.c b/board/kakadu/board.c
index 5c1a7d0ad3..1e3b26cfdb 100644
--- a/board/kakadu/board.c
+++ b/board/kakadu/board.c
@@ -181,7 +181,7 @@ int board_set_active_charge_port(int charge_port)
 		 */
 		gpio_set_level(GPIO_EN_POGO_CHARGE_L, 1);
 		gpio_set_level(GPIO_EN_USBC_CHARGE_L, 1);
-		charger_set_current(0);
+		charger_set_current(CHARGER_SOLO, 0);
 		break;
 	default:
 		panic("Invalid charge port\n");
diff --git a/board/kappa/board.c b/board/kappa/board.c
index 810b572a67..ea1821ee07 100644
--- a/board/kappa/board.c
+++ b/board/kappa/board.c
@@ -190,7 +190,7 @@ int board_set_active_charge_port(int charge_port)
 		 * even when battery is disconnected, keep VBAT rail on but
 		 * set the charging current to minimum.
 		 */
-		charger_set_current(0);
+		charger_set_current(CHARGER_SOLO, 0);
 		break;
 	default:
 		panic("Invalid charge port\n");
diff --git a/board/kodama/board.c b/board/kodama/board.c
index 08a4eeeeae..8be6ba345d 100644
--- a/board/kodama/board.c
+++ b/board/kodama/board.c
@@ -171,7 +171,7 @@ int board_set_active_charge_port(int charge_port)
 		 * even when battery is disconnected, keep VBAT rail on but
 		 * set the charging current to minimum.
 		 */
-		charger_set_current(0);
+		charger_set_current(CHARGER_SOLO, 0);
 		break;
 	default:
 		panic("Invalid charge port\n");
diff --git a/board/kukui/board.c b/board/kukui/board.c
index 2f71e46c89..422c60e123 100644
--- a/board/kukui/board.c
+++ b/board/kukui/board.c
@@ -195,7 +195,7 @@ int board_set_active_charge_port(int charge_port)
 		 */
 		gpio_set_level(GPIO_EN_POGO_CHARGE_L, 1);
 		gpio_set_level(GPIO_EN_USBC_CHARGE_L, 1);
-		charger_set_current(0);
+		charger_set_current(CHARGER_SOLO, 0);
 		break;
 	default:
 		panic("Invalid charge port\n");
diff --git a/board/scarlet/board.c b/board/scarlet/board.c
index b84062153c..7638bee9cf 100644
--- a/board/scarlet/board.c
+++ b/board/scarlet/board.c
@@ -192,7 +192,7 @@ int board_set_active_charge_port(int charge_port)
 		 * even when battery is disconnected, keep VBAT rail on but
 		 * set the charging current to minimum.
 		 */
-		charger_set_current(0);
+		charger_set_current(CHARGER_SOLO, 0);
 		break;
 	default:
 		panic("Invalid charge port\n");