summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTing Shen <phoenixshen@google.com>2019-07-24 16:26:00 +0800
committerCommit Bot <commit-bot@chromium.org>2019-07-31 18:56:56 +0000
commit74340f2dbe5ededa6cd466d32a727c7df977b956 (patch)
tree92a1a3783b9df587f5a47fad7766c2285e54a087
parent3e1c72ea23fe3c37f5a4e4e8bceea38c0322ba31 (diff)
downloadchrome-ec-74340f2dbe5ededa6cd466d32a727c7df977b956.tar.gz
jacuzzi: bringup ec
Initial version of jacuzzi ec. The files are basically copied from board/kukui/, battery and charger configured to the correct i2c port and component, and pogo / sensor removed. BUG=b:135895590 TEST=verify that this is bootable on a Jacuzzi, charger and battery looks good, and no error message spamming on ec console. BRANCH=master Change-Id: Ia786076c08019dd2aa1711a68ff1c82cc7fa45ed Signed-off-by: Ting Shen <phoenixshen@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1673955 Tested-by: Ting Shen <phoenixshen@chromium.org> Commit-Queue: Alexandru M Stan <amstan@chromium.org> Reviewed-by: Alexandru M Stan <amstan@chromium.org>
-rw-r--r--baseboard/kukui/baseboard.h12
-rw-r--r--baseboard/kukui/usb_pd_policy.c8
-rw-r--r--board/jacuzzi/board.c258
-rw-r--r--board/jacuzzi/board.h116
-rw-r--r--board/jacuzzi/build.mk15
-rw-r--r--board/jacuzzi/ec.tasklist20
-rw-r--r--board/jacuzzi/gpio.inc103
-rw-r--r--board/kukui/board.h1
8 files changed, 533 insertions, 0 deletions
diff --git a/baseboard/kukui/baseboard.h b/baseboard/kukui/baseboard.h
index 3499ced3df..d17012bccb 100644
--- a/baseboard/kukui/baseboard.h
+++ b/baseboard/kukui/baseboard.h
@@ -29,6 +29,7 @@
/*
* Variant charger defines, pick one:
* VARIANT_KUKUI_CHARGER_MT6370
+ * VARIANT_KUKUI_CHARGER_ISL9238
*/
#if defined(VARIANT_KUKUI_CHARGER_MT6370)
#define CONFIG_CHARGER_MT6370
@@ -39,10 +40,21 @@
#define CONFIG_USB_PD_TCPC_LOW_POWER
#define CONFIG_USB_PD_DISCHARGE_TCPC
#define CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE
+#elif defined(VARIANT_KUKUI_CHARGER_ISL9238)
+#define CONFIG_CHARGER_ISL9238
+#define CONFIG_CHARGER_SENSE_RESISTOR_AC 20 /* BOARD_RS1 */
+#define CONFIG_CHARGER_SENSE_RESISTOR 10 /* BOARD_RS2 */
+#define CONFIG_CHARGER_OTG
+#define CONFIG_CHARGE_RAMP_HW
#else
#error Must define a VARIANT_KUKUI_CHARGER
#endif /* VARIANT_KUKUI_CHARGER */
+/*
+ * Board controls dp mux via gpio pins USB_C0_DP_OE_L and USB_C0_DP_POLARITY.
+ */
+#undef VARIANT_KUKUI_DP_MUX_GPIO
+
/* Optional modules */
#define CONFIG_ADC
#undef CONFIG_ADC_WATCHDOG
diff --git a/baseboard/kukui/usb_pd_policy.c b/baseboard/kukui/usb_pd_policy.c
index 238ec4b1bf..54f4db0836 100644
--- a/baseboard/kukui/usb_pd_policy.c
+++ b/baseboard/kukui/usb_pd_policy.c
@@ -317,8 +317,10 @@ static void svdm_dp_post_config(int port)
return;
gpio_set_level(GPIO_USB_C0_HPD_OD, 1);
+#ifdef VARIANT_KUKUI_DP_MUX_GPIO
gpio_set_level(GPIO_USB_C0_DP_OE_L, 0);
gpio_set_level(GPIO_USB_C0_DP_POLARITY, board_get_polarity(port));
+#endif
/* set the minimum time delay (2ms) for the next HPD IRQ */
hpd_deadline[port] = get_time().val + HPD_USTREAM_DEBOUNCE_LVL;
@@ -354,9 +356,11 @@ static int svdm_dp_attention(int port, uint32_t *payload)
usleep(HPD_DSTREAM_DEBOUNCE_IRQ);
gpio_set_level(GPIO_USB_C0_HPD_OD, 1);
+#ifdef VARIANT_KUKUI_DP_MUX_GPIO
gpio_set_level(GPIO_USB_C0_DP_OE_L, 0);
gpio_set_level(GPIO_USB_C0_DP_POLARITY,
board_get_polarity(port));
+#endif
/* set the minimum time delay (2ms) for the next HPD IRQ */
hpd_deadline[port] = get_time().val + HPD_USTREAM_DEBOUNCE_LVL;
@@ -365,9 +369,11 @@ static int svdm_dp_attention(int port, uint32_t *payload)
return 0; /* nak */
} else {
gpio_set_level(GPIO_USB_C0_HPD_OD, lvl);
+#ifdef VARIANT_KUKUI_DP_MUX_GPIO
gpio_set_level(GPIO_USB_C0_DP_OE_L, !lvl);
gpio_set_level(GPIO_USB_C0_DP_POLARITY,
board_get_polarity(port));
+#endif
/* set the minimum time delay (2ms) for the next HPD IRQ */
hpd_deadline[port] = get_time().val + HPD_USTREAM_DEBOUNCE_LVL;
}
@@ -382,7 +388,9 @@ static void svdm_exit_dp_mode(int port)
svdm_safe_dp_mode(port);
gpio_set_level(GPIO_USB_C0_HPD_OD, 0);
+#ifdef VARIANT_KUKUI_DP_MUX_GPIO
gpio_set_level(GPIO_USB_C0_DP_OE_L, 1);
+#endif
mux->hpd_update(port, 0, 0);
}
diff --git a/board/jacuzzi/board.c b/board/jacuzzi/board.c
new file mode 100644
index 0000000000..16e1e296f9
--- /dev/null
+++ b/board/jacuzzi/board.c
@@ -0,0 +1,258 @@
+/* Copyright 2018 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 "adc.h"
+#include "adc_chip.h"
+#include "backlight.h"
+#include "button.h"
+#include "charge_manager.h"
+#include "charge_ramp.h"
+#include "charge_state.h"
+#include "charger.h"
+#include "chipset.h"
+#include "common.h"
+#include "console.h"
+#include "driver/accelgyro_bmi160.h"
+#include "driver/battery/max17055.h"
+#include "driver/bc12/pi3usb9201.h"
+#include "driver/charger/isl923x.h"
+#include "driver/sync.h"
+#include "driver/tcpm/fusb302.h"
+#include "driver/usb_mux/it5205.h"
+#include "ec_commands.h"
+#include "extpower.h"
+#include "gpio.h"
+#include "hooks.h"
+#include "host_command.h"
+#include "i2c.h"
+#include "lid_switch.h"
+#include "power.h"
+#include "power_button.h"
+#include "pwm.h"
+#include "pwm_chip.h"
+#include "registers.h"
+#include "spi.h"
+#include "system.h"
+#include "task.h"
+#include "tcpm.h"
+#include "timer.h"
+#include "usb_charge.h"
+#include "usb_mux.h"
+#include "usb_pd_tcpm.h"
+#include "util.h"
+
+#define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args)
+#define CPRINTF(format, args...) cprintf(CC_USBCHARGE, format, ## args)
+
+static void tcpc_alert_event(enum gpio_signal signal)
+{
+ schedule_deferred_pd_interrupt(0 /* port */);
+}
+
+#include "gpio_list.h"
+
+/******************************************************************************/
+/* ADC channels. Must be in the exactly same order as in enum adc_channel. */
+const struct adc_t adc_channels[] = {
+ [ADC_BOARD_ID] = {"BOARD_ID", 3300, 4096, 0, STM32_AIN(10)},
+ [ADC_EC_SKU_ID] = {"EC_SKU_ID", 3300, 4096, 0, STM32_AIN(8)},
+ [ADC_BATT_ID] = {"BATT_ID", 3300, 4096, 0, STM32_AIN(7)},
+};
+BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT);
+
+/******************************************************************************/
+/* I2C ports */
+const struct i2c_port_t i2c_ports[] = {
+ {"typec", 0, 400, GPIO_I2C1_SCL, GPIO_I2C1_SDA},
+ {"other", 1, 100, GPIO_I2C2_SCL, GPIO_I2C2_SDA},
+};
+const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports);
+
+#define BC12_I2C_ADDR PI3USB9201_I2C_ADDR_3
+
+/* power signal list. Must match order of enum power_signal. */
+const struct power_signal_info power_signal_list[] = {
+ {GPIO_AP_IN_SLEEP_L, POWER_SIGNAL_ACTIVE_LOW, "AP_IN_S3_L"},
+ {GPIO_PMIC_EC_RESETB, POWER_SIGNAL_ACTIVE_HIGH, "PMIC_PWR_GOOD"},
+};
+BUILD_ASSERT(ARRAY_SIZE(power_signal_list) == POWER_SIGNAL_COUNT);
+
+/******************************************************************************/
+/* SPI devices */
+/* TODO: to be added once sensors land via CL:1714436 */
+const struct spi_device_t spi_devices[] = {
+};
+const unsigned int spi_devices_used = ARRAY_SIZE(spi_devices);
+
+const struct pi3usb9201_config_t pi3usb9201_bc12_chips[] = {
+ {
+ .i2c_port = I2C_PORT_BC12,
+ .i2c_addr_flags = PI3USB9201_I2C_ADDR_3_FLAGS,
+ },
+};
+
+/******************************************************************************/
+const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = {
+ {
+ .bus_type = EC_BUS_TYPE_I2C,
+ .i2c_info = {
+ .port = I2C_PORT_TCPC0,
+ .addr_flags = FUSB302_I2C_SLAVE_ADDR_FLAGS,
+ },
+ .drv = &fusb302_tcpm_drv,
+ },
+};
+
+static void board_hpd_status(int port, int hpd_lvl, int hpd_irq)
+{
+ /* Invert HPD level since GPIOs are active low. */
+ hpd_lvl = !hpd_lvl;
+
+ gpio_set_level(GPIO_USB_C0_HPD_OD, hpd_lvl);
+ if (hpd_irq) {
+ gpio_set_level(GPIO_USB_C0_HPD_OD, 1);
+ msleep(1);
+ gpio_set_level(GPIO_USB_C0_HPD_OD, hpd_lvl);
+ }
+}
+
+struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_COUNT] = {
+ {
+ /* Driver uses I2C_PORT_USB_MUX as I2C port */
+ .port_addr = IT5205_I2C_ADDR1_FLAGS,
+ .driver = &it5205_usb_mux_driver,
+ .hpd_update = &board_hpd_status,
+ },
+};
+
+uint16_t tcpc_get_alert_status(void)
+{
+ uint16_t status = 0;
+
+ if (!gpio_get_level(GPIO_USB_C0_PD_INT_ODL))
+ status |= PD_STATUS_TCPC_ALERT_0;
+
+ return status;
+}
+
+static int force_discharge;
+
+int board_set_active_charge_port(int charge_port)
+{
+ CPRINTS("New chg p%d", charge_port);
+
+ /* ignore all request when discharge mode is on */
+ if (force_discharge)
+ return EC_SUCCESS;
+
+ switch (charge_port) {
+ case CHARGE_PORT_USB_C:
+ /* Don't charge from a source port */
+ if (board_vbus_source_enabled(charge_port))
+ return -1;
+ break;
+ case CHARGE_PORT_NONE:
+ /*
+ * To ensure the fuel gauge (max17055) is always powered
+ * even when battery is disconnected, keep VBAT rail on but
+ * set the charging current to minimum.
+ */
+ charger_set_current(0);
+ break;
+ default:
+ panic("Invalid charge port\n");
+ break;
+ }
+
+ return EC_SUCCESS;
+}
+
+void board_set_charge_limit(int port, int supplier, int charge_ma,
+ int max_ma, int charge_mv)
+{
+ charge_ma = (charge_ma * 95) / 100;
+ charge_set_input_current_limit(MAX(charge_ma,
+ CONFIG_CHARGER_INPUT_CURRENT), charge_mv);
+}
+
+int board_discharge_on_ac(int enable)
+{
+ int ret, port;
+
+ if (enable) {
+ port = CHARGE_PORT_NONE;
+ } else {
+ /* restore the charge port state */
+ port = charge_manager_get_override();
+ if (port == OVERRIDE_OFF)
+ port = charge_manager_get_active_charge_port();
+ }
+
+ ret = board_set_active_charge_port(port);
+ if (ret)
+ return ret;
+ force_discharge = enable;
+
+ return charger_discharge_on_ac(enable);
+}
+
+int extpower_is_present(void)
+{
+ /*
+ * The charger will indicate VBUS presence if we're sourcing 5V,
+ * so exclude such ports.
+ */
+ if (board_vbus_source_enabled(0))
+ return 0;
+ else
+ return tcpm_get_vbus_level(0);
+}
+
+int pd_snk_is_vbus_provided(int port)
+{
+ /* TODO(b:138352732): read IT8801 GPIO EN_USBC_CHARGE_L */
+ return EC_ERROR_UNIMPLEMENTED;
+}
+
+static void board_init(void)
+{
+ /* If the reset cause is external, pulse PMIC force reset. */
+ if (system_get_reset_flags() == RESET_FLAG_RESET_PIN) {
+ gpio_set_level(GPIO_PMIC_FORCE_RESET_ODL, 0);
+ msleep(100);
+ gpio_set_level(GPIO_PMIC_FORCE_RESET_ODL, 1);
+ }
+
+ /* Set SPI1 PB13/14/15 pins to high speed */
+ STM32_GPIO_OSPEEDR(GPIO_B) |= 0xfc000000;
+
+ /* Enable TCPC alert interrupts */
+ gpio_enable_interrupt(GPIO_USB_C0_PD_INT_ODL);
+
+#ifdef SECTION_IS_RW
+ /* Enable interrupts from BMI160 sensor. */
+ gpio_enable_interrupt(GPIO_ACCEL_INT_ODL);
+#endif /* SECTION_IS_RW */
+
+ /* Enable interrupt from PMIC. */
+ gpio_enable_interrupt(GPIO_PMIC_EC_RESETB);
+}
+DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT);
+
+/* Motion sensors */
+/* Mutexes */
+#ifdef SECTION_IS_RW
+/* TODO: to be added once sensors land via CL:1714436 */
+struct motion_sensor_t motion_sensors[] = {
+};
+const unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors);
+
+#endif /* SECTION_IS_RW */
+
+/* TODO(b:138640167): config charger correctly */
+int charger_is_sourcing_otg_power(int port)
+{
+ return 0;
+}
diff --git a/board/jacuzzi/board.h b/board/jacuzzi/board.h
new file mode 100644
index 0000000000..63f41047e4
--- /dev/null
+++ b/board/jacuzzi/board.h
@@ -0,0 +1,116 @@
+/* Copyright 2018 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.
+ */
+
+/* Configuration for Kukui */
+
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
+
+#define VARIANT_KUKUI_BATTERY_SMART
+#define VARIANT_KUKUI_CHARGER_ISL9238
+
+#include "baseboard.h"
+
+/* TODO(b:135086465) led implementation */
+#undef CONFIG_LED_COMMON
+
+#define CONFIG_CHARGER_PSYS
+
+#define CONFIG_BC12_DETECT_PI3USB9201
+
+#define CONFIG_USB_PD_TCPM_FUSB302
+#define CONFIG_USB_PD_DISCHARGE_GPIO
+#define CONFIG_USB_PD_VBUS_MEASURE_NOT_PRESENT
+
+#define CONFIG_USB_MUX_IT5205
+
+/* Motion Sensors */
+#ifdef SECTION_IS_RW
+#define CONFIG_MAG_BMI160_BMM150
+#define CONFIG_ACCELGYRO_SEC_ADDR_FLAGS BMM150_ADDR0_FLAGS
+#define CONFIG_MAG_CALIBRATE
+#define CONFIG_ACCELGYRO_BMI160
+#define CONFIG_ACCEL_INTERRUPTS
+#define CONFIG_ACCELGYRO_BMI160_INT_EVENT \
+ TASK_EVENT_MOTION_SENSOR_INTERRUPT(LID_ACCEL)
+#define CONFIG_ALS
+
+#define ALS_COUNT 1
+#define CONFIG_ALS_TCS3400
+#define CONFIG_ALS_TCS3400_INT_EVENT \
+ TASK_EVENT_MOTION_SENSOR_INTERRUPT(CLEAR_ALS)
+#define CONFIG_ALS_TCS3400_EMULATED_IRQ_EVENT
+#define CONFIG_ACCEL_FORCE_MODE_MASK BIT(CLEAR_ALS)
+
+#endif /* SECTION_IS_RW */
+
+/* I2C ports */
+#define I2C_PORT_BC12 0
+#define I2C_PORT_TCPC0 0
+#define I2C_PORT_USB_MUX 0
+#define I2C_PORT_CHARGER 1
+#define I2C_PORT_BATTERY 1
+#define I2C_PORT_VIRTUAL_BATTERY 1
+#define I2C_PORT_IO_EXPANDER_IT8801 1
+
+/* Enable Accel over SPI */
+#define CONFIG_SPI_ACCEL_PORT 0 /* The first SPI master port (SPI2) */
+
+#define CONFIG_KEYBOARD_PROTOCOL_MKBP
+#define CONFIG_MKBP_EVENT
+#define CONFIG_MKBP_USE_GPIO
+/* Define the MKBP events which are allowed to wakeup AP in S3. */
+#define CONFIG_MKBP_HOST_EVENT_WAKEUP_MASK \
+ (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN) |\
+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON))
+
+#ifndef __ASSEMBLER__
+
+enum adc_channel {
+ /* Real ADC channels begin here */
+ ADC_BOARD_ID = 0,
+ ADC_EC_SKU_ID,
+ ADC_BATT_ID,
+ ADC_CH_COUNT
+};
+
+/* power signal definitions */
+enum power_signal {
+ AP_IN_S3_L,
+ PMIC_PWR_GOOD,
+
+ /* Number of signals */
+ POWER_SIGNAL_COUNT,
+};
+
+/* Motion sensors */
+enum sensor_id {
+ LID_ACCEL = 0,
+ LID_GYRO,
+ LID_MAG,
+ CLEAR_ALS,
+ RGB_ALS,
+ VSYNC,
+ SENSOR_COUNT,
+};
+
+enum charge_port {
+ CHARGE_PORT_USB_C,
+};
+#include "gpio_signal.h"
+#include "registers.h"
+
+#ifdef SECTION_IS_RO
+/* Interrupt handler for emmc task */
+void emmc_cmd_interrupt(enum gpio_signal signal);
+#endif
+
+void board_reset_pd_mcu(void);
+int board_get_version(void);
+int board_is_sourcing_vbus(int port);
+
+#endif /* !__ASSEMBLER__ */
+
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/jacuzzi/build.mk b/board/jacuzzi/build.mk
new file mode 100644
index 0000000000..5c0560e188
--- /dev/null
+++ b/board/jacuzzi/build.mk
@@ -0,0 +1,15 @@
+# -*- makefile -*-
+# Copyright 2018 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.
+#
+# Board specific files build
+#
+#
+# STmicro STM32F098VC
+CHIP:=stm32
+CHIP_FAMILY:=stm32f0
+CHIP_VARIANT:=stm32f09x
+BASEBOARD:=kukui
+
+board-y=board.o
diff --git a/board/jacuzzi/ec.tasklist b/board/jacuzzi/ec.tasklist
new file mode 100644
index 0000000000..f4fb8670ea
--- /dev/null
+++ b/board/jacuzzi/ec.tasklist
@@ -0,0 +1,20 @@
+/* Copyright 2018 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.
+ */
+
+/**
+ * See CONFIG_TASK_LIST in config.h for details.
+ */
+#define CONFIG_TASK_LIST \
+ TASK_ALWAYS(HOOKS, hook_task, NULL, LARGER_TASK_STACK_SIZE) \
+ TASK_ALWAYS(CHARGER, charger_task, NULL, VENTI_TASK_STACK_SIZE) \
+ TASK_ALWAYS(USB_CHG_P0, usb_charger_task, NULL, VENTI_TASK_STACK_SIZE) \
+ TASK_NOTEST(CHIPSET, chipset_task, NULL, LARGER_TASK_STACK_SIZE) \
+ TASK_ALWAYS_RW(MOTIONSENSE, motion_sense_task, NULL, VENTI_TASK_STACK_SIZE) \
+ TASK_NOTEST(PDCMD, pd_command_task, NULL, 1024) \
+ TASK_ALWAYS(HOSTCMD, host_command_task, NULL, 1024) \
+ TASK_ALWAYS(CONSOLE, console_task, NULL, LARGER_TASK_STACK_SIZE) \
+ TASK_ALWAYS(PD_C0, pd_task, NULL, 1280) \
+ TASK_ALWAYS(PD_INT_C0, pd_interrupt_handler_task, 0, 1024) \
+ TASK_ALWAYS_RO(EMMC, emmc_task, NULL, LARGER_TASK_STACK_SIZE)
diff --git a/board/jacuzzi/gpio.inc b/board/jacuzzi/gpio.inc
new file mode 100644
index 0000000000..2cad7889b6
--- /dev/null
+++ b/board/jacuzzi/gpio.inc
@@ -0,0 +1,103 @@
+/* -*- mode:c -*-
+ *
+ * Copyright 2018 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.
+ */
+
+/*
+ * Declare symbolic names for all the GPIOs that we care about.
+ * Note: Those with interrupt handlers must be declared first.
+ */
+
+/* Interrupts */
+GPIO_INT(USB_C0_PD_INT_ODL, PIN(B, 1), GPIO_INT_FALLING | GPIO_PULL_UP,
+ tcpc_alert_event)
+GPIO_INT(POWER_BUTTON_L, PIN(A, 0), GPIO_INT_BOTH | GPIO_PULL_UP,
+ power_button_interrupt) /* EC_PWR_BTN_ODL */
+GPIO_INT(AP_IN_SLEEP_L, PIN(C, 12), GPIO_INT_BOTH | GPIO_PULL_DOWN,
+ power_signal_interrupt)
+GPIO_INT(PMIC_EC_RESETB, PIN(B, 7), GPIO_INT_BOTH | GPIO_PULL_DOWN,
+ power_signal_interrupt)
+GPIO_INT(WARM_RESET_REQ, PIN(A, 3), GPIO_INT_RISING | GPIO_PULL_DOWN,
+ chipset_reset_request_interrupt)
+GPIO_INT_RW(ACCEL_INT_ODL, PIN(A, 4), GPIO_INT_FALLING | GPIO_SEL_1P8V | GPIO_PULL_UP,
+ bmi160_interrupt)
+GPIO_INT_RO(EMMC_CMD, PIN(B, 15), GPIO_INT_FALLING,
+ emmc_cmd_interrupt)
+GPIO_INT(SPI1_NSS, PIN(A, 15), GPIO_INT_BOTH,
+ spi_event) /* SPI_AP_EC_CS_L */
+GPIO_INT(LID_OPEN, PIN(C, 5), GPIO_INT_BOTH,
+ lid_interrupt)
+
+/* Unimplemented interrupts */
+GPIO(ACOK_OD, PIN(A, 6), GPIO_INPUT)
+GPIO(KB_INT_ODL, PIN(A, 8), GPIO_INPUT)
+GPIO(BC12_EC_INT_ODL, PIN(C, 9), GPIO_INPUT)
+GPIO(ALS_RGB_INT_ODL, PIN(C, 10), GPIO_INPUT)
+GPIO(TABLET_MODE_L, PIN(B, 11), GPIO_INPUT)
+GPIO(LID_ACCEL_INT_ODL, PIN(A, 14), GPIO_INPUT)
+
+/* Reset pins */
+GPIO(AP_SYS_RST_L, PIN(C, 11), GPIO_OUT_LOW)
+GPIO(PMIC_WATCHDOG_L, PIN(A, 2), GPIO_OUT_LOW)
+GPIO(PMIC_EN_ODL, PIN(F, 0), GPIO_ODR_HIGH)
+
+/*
+ * I2C pins should be configured as inputs until I2C module is
+ * initialized. This will avoid driving the lines unintentionally.
+ */
+GPIO(I2C1_SCL, PIN(B, 8), GPIO_INPUT)
+GPIO(I2C1_SDA, PIN(B, 9), GPIO_INPUT)
+GPIO(I2C2_SCL, PIN(A, 11), GPIO_INPUT)
+GPIO(I2C2_SDA, PIN(A, 12), GPIO_INPUT)
+
+/* Analog pins */
+GPIO(BOARD_ID, PIN(C, 0), GPIO_ANALOG)
+GPIO(EC_SKU_ID, PIN(B, 0), GPIO_ANALOG)
+
+/* Other input pins */
+GPIO(WP_L, PIN(C, 8), GPIO_INPUT) /* EC_FLASH_WP_ODL */
+GPIO(BOOT0, PIN(F, 11), GPIO_INPUT)
+GPIO(CCD_MODE_ODL, PIN(A, 1), GPIO_INPUT)
+
+/* Other output pins */
+GPIO(EC_BATT_PRES_ODL, PIN(A, 7), GPIO_INPUT)
+GPIO(AP_EC_WATCHDOG_L, PIN(D, 2), GPIO_ODR_HIGH)
+GPIO(EC_BL_EN_OD, PIN(A, 13), GPIO_ODR_HIGH)
+GPIO(EN_USBA_5V, PIN(C, 14), GPIO_OUT_LOW)
+GPIO(EC_SENSOR_SPI_MISO, PIN(C, 2), GPIO_INPUT)
+GPIO(EC_SENSOR_SPI_MOSI, PIN(C, 3), GPIO_OUT_LOW)
+GPIO(EC_SENSOR_SPI_NSS, PIN(B, 12), GPIO_OUT_LOW)
+GPIO(EC_SENSOR_SPI_CK, PIN(B, 10), GPIO_OUT_HIGH)
+GPIO(ENTERING_RW, PIN(C, 6), GPIO_ODR_HIGH) /* EC_ENTERING_RW_ODL */
+GPIO(EC_INT_L, PIN(C, 7), GPIO_ODR_HIGH) /* EC_AP_INT_ODL */
+GPIO(EC_BOARD_ID_EN_L, PIN(C, 15), GPIO_ODR_HIGH) /* EC_BOARD_ID_EN_ODL */
+GPIO(USB_C0_HPD_OD, PIN(F, 1), GPIO_ODR_LOW)
+GPIO(BOOTBLOCK_EN_L, PIN(C, 1), GPIO_ODR_HIGH)
+
+/*
+ * TODO(b:138352732): On IT88801 expander, To be readded once IT8801 driver and
+ * gpio expander framework has landed.
+ */
+UNIMPLEMENTED(EN_PP5000_USBC)
+UNIMPLEMENTED(PMIC_FORCE_RESET_ODL)
+UNIMPLEMENTED(EN_USBC_CHARGE_L)
+
+/* TODO(b:137939749): to be added in later versions */
+UNIMPLEMENTED(USB_C0_DISCHARGE)
+
+/* USART1: PA9/PA10 */
+ALTERNATE(PIN_MASK(A, 0x0600), 1, MODULE_UART, 0)
+/* I2C MASTER: PB8/9 */
+ALTERNATE(PIN_MASK(B, 0x0300), 1, MODULE_I2C, GPIO_ODR_HIGH )
+/* I2C MASTER: PA11/12 */
+ALTERNATE(PIN_MASK(A, 0x1800), 5, MODULE_I2C, GPIO_ODR_HIGH )
+/* SPI SLAVE: PB3/4/5 */
+ALTERNATE(PIN_MASK(B, 0x0038), 0, MODULE_SPI, 0)
+/* SPI SLAVE CS: PA15 */
+ALTERNATE(PIN_MASK(A, 0x8000), 0, MODULE_SPI, 0)
+#ifdef SECTION_IS_RO
+/* SPI SLAVE: PB13/14/15 */
+ALTERNATE(PIN_MASK(B, 0xE000), 0, MODULE_SPI_FLASH, 0)
+#endif
diff --git a/board/kukui/board.h b/board/kukui/board.h
index 6808efb49e..2b03844cb2 100644
--- a/board/kukui/board.h
+++ b/board/kukui/board.h
@@ -15,6 +15,7 @@
#endif
#define VARIANT_KUKUI_CHARGER_MT6370
+#define VARIANT_KUKUI_DP_MUX_GPIO
#include "baseboard.h"