brya: Move charger config from baseboard to board

Move charger config from baseboard to board.
Change Kano charger to isl9241.

BUG=none
BRANCH=brya
TEST=make buildall -j succeeded.

Signed-off-by: David Huang <david.huang@quanta.corp-partner.google.com>
Change-Id: Ia97424bbcf0654127e21c47d6834ad6c2c6163ee
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3132556
Reviewed-by: Boris Mittelberg <bmbm@google.com>
Commit-Queue: Boris Mittelberg <bmbm@google.com>

19 files changed, 106 insertions, 3 deletions

diff --git a/baseboard/brya/build.mk b/baseboard/brya/build.mk
index e03e0a919c..ca983f26ac 100644
--- a/baseboard/brya/build.mk
+++ b/baseboard/brya/build.mk
@@ -10,5 +10,4 @@ baseboard-y=
 baseboard-y+=baseboard.o
 baseboard-y+=battery_presence.o
 baseboard-y+=cbi.o
-baseboard-y+=charger.o
 baseboard-y+=usb_pd_policy.o
diff --git a/baseboard/brya/charger.c b/baseboard/brya/charger_bq25720.c
index 04be67147d..04be67147d 100644
--- a/baseboard/brya/charger.c
+++ b/baseboard/brya/charger_bq25720.c
diff --git a/board/anahera/build.mk b/board/anahera/build.mk
index c7f14ff9d7..ebfbe57fdc 100644
--- a/board/anahera/build.mk
+++ b/board/anahera/build.mk
@@ -14,6 +14,7 @@ BASEBOARD:=brya
 board-y=
 board-y+=battery.o
 board-y+=board.o
+board-y+=charger.o
 board-y+=fans.o
 board-y+=fw_config.o
 board-y+=i2c.o
diff --git a/board/anahera/charger.c b/board/anahera/charger.c
new file mode 120000
index 0000000000..476ce97df2
--- /dev/null
+++ b/board/anahera/charger.c
@@ -0,0 +1 @@
+../../baseboard/brya/charger_bq25720.c
\ No newline at end of file
diff --git a/board/brya/build.mk b/board/brya/build.mk
index 67cc3b39d0..674c17c1df 100644
--- a/board/brya/build.mk
+++ b/board/brya/build.mk
@@ -14,6 +14,7 @@ BASEBOARD:=brya
 board-y=
 board-y+=battery.o
 board-y+=board.o
+board-y+=charger.o
 board-y+=fans.o
 board-y+=fw_config.o
 board-y+=i2c.o
diff --git a/board/brya/charger.c b/board/brya/charger.c
new file mode 120000
index 0000000000..476ce97df2
--- /dev/null
+++ b/board/brya/charger.c
@@ -0,0 +1 @@
+../../baseboard/brya/charger_bq25720.c
\ No newline at end of file
diff --git a/board/felwinter/build.mk b/board/felwinter/build.mk
index 78fee4583b..6d1303a15a 100644
--- a/board/felwinter/build.mk
+++ b/board/felwinter/build.mk
@@ -14,6 +14,7 @@ BASEBOARD:=brya
 board-y=
 board-y+=battery.o
 board-y+=board.o
+board-y+=charger.o
 board-y+=fans.o
 board-y+=fw_config.o
 board-y+=i2c.o
diff --git a/board/felwinter/charger.c b/board/felwinter/charger.c
new file mode 120000
index 0000000000..476ce97df2
--- /dev/null
+++ b/board/felwinter/charger.c
@@ -0,0 +1 @@
+../../baseboard/brya/charger_bq25720.c
\ No newline at end of file
diff --git a/board/gimble/build.mk b/board/gimble/build.mk
index 9ec302a7d9..c43f37b4dd 100644
--- a/board/gimble/build.mk
+++ b/board/gimble/build.mk
@@ -14,6 +14,7 @@ BASEBOARD:=brya
 board-y=
 board-y+=battery.o
 board-y+=board.o
+board-y+=charger.o
 board-y+=fans.o
 board-y+=fw_config.o
 board-y+=i2c.o
diff --git a/board/gimble/charger.c b/board/gimble/charger.c
new file mode 120000
index 0000000000..476ce97df2
--- /dev/null
+++ b/board/gimble/charger.c
@@ -0,0 +1 @@
+../../baseboard/brya/charger_bq25720.c
\ No newline at end of file
diff --git a/board/kano/board.h b/board/kano/board.h
index 2f1103ae09..494e0e8d92 100644
--- a/board/kano/board.h
+++ b/board/kano/board.h
@@ -184,8 +184,7 @@
 /* #define CONFIG_FANS			FAN_CH_COUNT */
 
 /* Charger defines */
-#define CONFIG_CHARGER_BQ25720
-#define CONFIG_CHARGER_BQ25720_VSYS_TH2_DV	70
+#define CONFIG_CHARGER_ISL9241
 #define CONFIG_CHARGE_RAMP_SW
 #define CONFIG_CHARGER_SENSE_RESISTOR		10
 #define CONFIG_CHARGER_SENSE_RESISTOR_AC	10
diff --git a/board/kano/build.mk b/board/kano/build.mk
index 78fee4583b..6d1303a15a 100644
--- a/board/kano/build.mk
+++ b/board/kano/build.mk
@@ -14,6 +14,7 @@ BASEBOARD:=brya
 board-y=
 board-y+=battery.o
 board-y+=board.o
+board-y+=charger.o
 board-y+=fans.o
 board-y+=fw_config.o
 board-y+=i2c.o
diff --git a/board/kano/charger.c b/board/kano/charger.c
new file mode 100644
index 0000000000..9f7c760858
--- /dev/null
+++ b/board/kano/charger.c
@@ -0,0 +1,90 @@
+/* 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.
+ */
+
+#include "common.h"
+
+#include "charge_manager.h"
+#include "charge_state_v2.h"
+#include "charger.h"
+#include "compile_time_macros.h"
+#include "console.h"
+#include "driver/charger/isl9241.h"
+#include "usbc_ppc.h"
+#include "usb_pd.h"
+#include "util.h"
+
+
+#define CPRINTSUSB(format, args...) cprints(CC_USBCHARGE, format, ## args)
+#define CPRINTFUSB(format, args...) cprintf(CC_USBCHARGE, format, ## args)
+
+/* Charger Chip Configuration */
+const struct charger_config_t chg_chips[] = {
+	{
+		.i2c_port = I2C_PORT_CHARGER,
+		.i2c_addr_flags = ISL9241_ADDR_FLAGS,
+		.drv = &isl9241_drv,
+	},
+};
+BUILD_ASSERT(ARRAY_SIZE(chg_chips) == CHARGER_NUM);
+
+int board_set_active_charge_port(int port)
+{
+	int is_valid_port = board_is_usb_pd_port_present(port);
+	int i;
+
+	if (port == CHARGE_PORT_NONE) {
+		CPRINTSUSB("Disabling all charger ports");
+
+		/* Disable all ports. */
+		for (i = 0; i < ppc_cnt; i++) {
+			/*
+			 * Do not return early if one fails otherwise we can
+			 * get into a boot loop assertion failure.
+			 */
+			if (ppc_vbus_sink_enable(i, 0))
+				CPRINTSUSB("Disabling C%d as sink failed.", i);
+		}
+
+		return EC_SUCCESS;
+	} else if (!is_valid_port) {
+		return EC_ERROR_INVAL;
+	}
+
+	/* Check if the port is sourcing VBUS. */
+	if (ppc_is_sourcing_vbus(port)) {
+		CPRINTFUSB("Skip enable C%d", port);
+		return EC_ERROR_INVAL;
+	}
+
+	CPRINTSUSB("New charge port: C%d", port);
+
+	/*
+	 * Turn off the other ports' sink path FETs, before enabling the
+	 * requested charge port.
+	 */
+	for (i = 0; i < ppc_cnt; i++) {
+		if (i == port)
+			continue;
+
+		if (ppc_vbus_sink_enable(i, 0))
+			CPRINTSUSB("C%d: sink path disable failed.", i);
+	}
+
+	/* Enable requested charge port. */
+	if (ppc_vbus_sink_enable(port, 1)) {
+		CPRINTSUSB("C%d: sink path enable failed.", port);
+		return EC_ERROR_UNKNOWN;
+	}
+
+	return EC_SUCCESS;
+}
+
+__overridable void board_set_charge_limit(int port, int supplier, int charge_ma,
+					  int max_ma, int charge_mv)
+{
+	charge_set_input_current_limit(MAX(charge_ma,
+					   CONFIG_CHARGER_INPUT_CURRENT),
+				       charge_mv);
+}
diff --git a/board/primus/build.mk b/board/primus/build.mk
index 81b9d5efe3..d6fe9b4808 100644
--- a/board/primus/build.mk
+++ b/board/primus/build.mk
@@ -14,6 +14,7 @@ BASEBOARD:=brya
 board-y=
 board-y+=battery.o
 board-y+=board.o
+board-y+=charger.o
 board-y+=fans.o
 board-y+=fw_config.o
 board-y+=i2c.o
diff --git a/board/primus/charger.c b/board/primus/charger.c
new file mode 120000
index 0000000000..476ce97df2
--- /dev/null
+++ b/board/primus/charger.c
@@ -0,0 +1 @@
+../../baseboard/brya/charger_bq25720.c
\ No newline at end of file
diff --git a/board/redrix/build.mk b/board/redrix/build.mk
index 84ea934e6f..e3a4fe0734 100644
--- a/board/redrix/build.mk
+++ b/board/redrix/build.mk
@@ -14,6 +14,7 @@ BASEBOARD:=brya
 board-y=
 board-y+=battery.o
 board-y+=board.o
+board-y+=charger.o
 board-y+=fans.o
 board-y+=fw_config.o
 board-y+=i2c.o
diff --git a/board/redrix/charger.c b/board/redrix/charger.c
new file mode 120000
index 0000000000..476ce97df2
--- /dev/null
+++ b/board/redrix/charger.c
@@ -0,0 +1 @@
+../../baseboard/brya/charger_bq25720.c
\ No newline at end of file
diff --git a/board/taeko/build.mk b/board/taeko/build.mk
index 7751dbacbb..ae2e428753 100644
--- a/board/taeko/build.mk
+++ b/board/taeko/build.mk
@@ -14,6 +14,7 @@ BASEBOARD:=brya
 board-y=
 board-y+=battery.o
 board-y+=board.o
+board-y+=charger.o
 board-y+=fans.o
 board-y+=fw_config.o
 board-y+=i2c.o
diff --git a/board/taeko/charger.c b/board/taeko/charger.c
new file mode 120000
index 0000000000..476ce97df2
--- /dev/null
+++ b/board/taeko/charger.c
@@ -0,0 +1 @@
+../../baseboard/brya/charger_bq25720.c
\ No newline at end of file