cherry: GPIO configuration

BUG=b:180886390,b:178158810
TEST=make
BRANCH=main

Signed-off-by: Ting Shen <phoenixshen@google.com>
Change-Id: I99631c73112a4123dc24bd25825f59a6ff948dca
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2731395
Reviewed-by: Eric Yilun Lin <yllin@chromium.org>
Commit-Queue: Ting Shen <phoenixshen@chromium.org>
Tested-by: Ting Shen <phoenixshen@chromium.org>

6 files changed, 45 insertions, 214 deletions

diff --git a/baseboard/cherry/baseboard.c b/baseboard/cherry/baseboard.c
index f4aa61cc5e..67fbc244ca 100644
--- a/baseboard/cherry/baseboard.c
+++ b/baseboard/cherry/baseboard.c
@@ -53,15 +53,12 @@
 
 static void bc12_interrupt(enum gpio_signal signal);
 static void ppc_interrupt(enum gpio_signal signal);
-static void x_ec_interrupt(enum gpio_signal signal);
 
 #include "gpio_list.h"
 
 #define CPRINTS(format, args...) cprints(CC_SYSTEM, format, ## args)
 #define CPRINTF(format, args...) cprintf(CC_SYSTEM, format, ## args)
 
-static enum board_sub_board board_get_sub_board(void);
-
 /* Wake-up pins for hibernate */
 enum gpio_signal hibernate_wake_pins[] = {
 	GPIO_AC_PRESENT,
@@ -85,16 +82,7 @@ __override void board_hibernate_late(void)
 	 * Don't care for devices with Z-state.
 	 */
 	gpio_set_level(GPIO_EN_PP5000_A, 0);
-
-	/*
-	 * GPIO_EN_SLP_Z not implemented in rev0/1,
-	 * fallback to usual hibernate process.
-	 */
-	if (board_get_version() <= 1)
-		return;
-
 	isl9238c_hibernate(CHARGER_SOLO);
-
 	gpio_set_level(GPIO_EN_SLP_Z, 1);
 
 	/* should not reach here */
@@ -109,18 +97,11 @@ const struct power_signal_info power_signal_list[] = {
 };
 BUILD_ASSERT(ARRAY_SIZE(power_signal_list) == POWER_SIGNAL_COUNT);
 
-/* Detect subboard */
 static void board_tcpc_init(void)
 {
 	gpio_enable_interrupt(GPIO_USB_C0_PPC_INT_ODL);
-	/* C1: GPIO_USB_C1_PPC_INT_ODL & HDMI: GPIO_PS185_EC_DP_HPD */
-	gpio_enable_interrupt(GPIO_X_EC_GPIO2);
-
-	/* If this is not a Type-C subboard, disable the task. */
-	if (board_get_sub_board() != SUB_BOARD_TYPEC)
-		task_disable_task(TASK_ID_PD_C1);
 }
-/* Must be done after I2C and subboard */
+/* Must be done after I2C */
 DECLARE_HOOK(HOOK_INIT, board_tcpc_init, HOOK_PRIO_INIT_I2C + 1);
 
 /* ADC channels. Must be in the exactly same order as in enum adc_channel. */
@@ -145,10 +126,7 @@ struct ppc_config_t ppc_chips[CONFIG_USB_PD_PORT_MAX_COUNT] = {
 		.frs_en = GPIO_USB_C0_FRS_EN,
 	},
 	{
-		.i2c_port = I2C_PORT_PPC1,
-		.i2c_addr_flags = SYV682X_ADDR0_FLAGS,
-		.drv = &syv682x_drv,
-		.frs_en = GPIO_USB_C1_FRS_EN,
+		/* TODO: enable rt1718s */
 	},
 };
 unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips);
@@ -181,17 +159,6 @@ static void bc12_interrupt(enum gpio_signal signal)
 		task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12);
 }
 
-static void board_sub_bc12_init(void)
-{
-	if (board_get_sub_board() == SUB_BOARD_TYPEC)
-		gpio_enable_interrupt(GPIO_USB_C1_BC12_INT_L);
-	else
-		/* If this is not a Type-C subboard, disable the task. */
-		task_disable_task(TASK_ID_USB_CHG_P1);
-}
-/* Must be done after I2C and subboard */
-DECLARE_HOOK(HOOK_INIT, board_sub_bc12_init, HOOK_PRIO_INIT_I2C + 1);
-
 static void ppc_interrupt(enum gpio_signal signal)
 {
 	if (signal == GPIO_USB_C0_PPC_INT_ODL)
@@ -230,55 +197,6 @@ const struct pwm_t pwm_channels[] = {
 BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT);
 
 
-/* Sub-board */
-
-static enum board_sub_board board_get_sub_board(void)
-{
-	static enum board_sub_board sub = SUB_BOARD_NONE;
-
-	if (sub != SUB_BOARD_NONE)
-		return sub;
-
-	/* HDMI board has external pull high. */
-	if (gpio_get_level(GPIO_EC_X_GPIO3)) {
-		sub = SUB_BOARD_HDMI;
-		/* Only has 1 PPC with HDMI subboard */
-		ppc_cnt = 1;
-		/* EC_X_GPIO1 */
-		gpio_set_flags(GPIO_EN_HDMI_PWR, GPIO_OUT_HIGH);
-		/* X_EC_GPIO2 */
-		gpio_set_flags(GPIO_PS185_EC_DP_HPD, GPIO_INT_BOTH);
-		/* EC_X_GPIO3 */
-		gpio_set_flags(GPIO_PS185_PWRDN_ODL, GPIO_ODR_HIGH);
-	} else {
-		sub = SUB_BOARD_TYPEC;
-		/* EC_X_GPIO1 */
-		gpio_set_flags(GPIO_USB_C1_FRS_EN, GPIO_OUT_LOW);
-		/* X_EC_GPIO2 */
-		gpio_set_flags(GPIO_USB_C1_PPC_INT_ODL,
-			       GPIO_INT_BOTH | GPIO_PULL_UP);
-		/* EC_X_GPIO3 */
-		gpio_set_flags(GPIO_USB_C1_DP_IN_HPD, GPIO_OUT_LOW);
-	}
-
-	CPRINTS("Detect %s SUB", sub == SUB_BOARD_HDMI ? "HDMI" : "TYPEC");
-	return sub;
-}
-
-static void sub_board_init(void)
-{
-	board_get_sub_board();
-}
-DECLARE_HOOK(HOOK_INIT, sub_board_init, HOOK_PRIO_INIT_I2C - 1);
-
-__override uint8_t board_get_usb_pd_port_count(void)
-{
-	if (board_get_sub_board() == SUB_BOARD_TYPEC)
-		return CONFIG_USB_PD_PORT_MAX_COUNT;
-	else
-		return CONFIG_USB_PD_PORT_MAX_COUNT - 1;
-}
-
 /* Called on AP S3 -> S0 transition */
 static void board_chipset_resume(void)
 {
@@ -295,7 +213,7 @@ DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, board_chipset_suspend, HOOK_PRIO_DEFAULT);
 
 /* USB-A */
 const int usb_port_enable[] = {
-	GPIO_EN_PP5000_USB_A0_VBUS,
+	GPIO_EN_PP5000_USB_A0_VBUS_X,
 };
 BUILD_ASSERT(ARRAY_SIZE(usb_port_enable) == USB_PORT_COUNT);
 
@@ -303,10 +221,9 @@ BUILD_ASSERT(ARRAY_SIZE(usb_port_enable) == USB_PORT_COUNT);
 
 void board_usb_mux_init(void)
 {
-	if (board_get_sub_board() == SUB_BOARD_TYPEC)
-		ps8743_tune_usb_eq(&usb_muxes[1],
-				   PS8743_USB_EQ_TX_12_8_DB,
-				   PS8743_USB_EQ_RX_12_8_DB);
+	ps8743_tune_usb_eq(&usb_muxes[1],
+			   PS8743_USB_EQ_TX_12_8_DB,
+			   PS8743_USB_EQ_RX_12_8_DB);
 }
 DECLARE_HOOK(HOOK_INIT, board_usb_mux_init, HOOK_PRIO_INIT_I2C + 1);
 
@@ -462,8 +379,7 @@ void board_pd_vconn_ctrl(int port, enum usbpd_cc_pin cc_pin, int enabled)
 int board_set_active_charge_port(int port)
 {
 	int i;
-	int is_valid_port = port == 0 || (port == 1 && board_get_sub_board() ==
-							       SUB_BOARD_TYPEC);
+	bool is_valid_port = (port == 0 || port == 1);
 
 	if (!is_valid_port && port != CHARGE_PORT_NONE)
 		return EC_ERROR_INVAL;
@@ -513,54 +429,12 @@ int board_set_active_charge_port(int port)
 	return EC_SUCCESS;
 }
 
-/**
- * Handle PS185 HPD changing state.
- */
-int debounced_hpd;
-
-static void ps185_hdmi_hpd_deferred(void)
-{
-	const int new_hpd = gpio_get_level(GPIO_PS185_EC_DP_HPD);
-
-	/* HPD status not changed, probably a glitch, just return. */
-	if (debounced_hpd == new_hpd)
-		return;
-
-	debounced_hpd = new_hpd;
-
-	gpio_set_level(GPIO_EC_DPBRDG_HPD_ODL, !debounced_hpd);
-	CPRINTS(debounced_hpd ? "HDMI plug" : "HDMI unplug");
-}
-DECLARE_DEFERRED(ps185_hdmi_hpd_deferred);
-
-#define PS185_HPD_DEBOUCE 250
-
-static void hdmi_hpd_interrupt(enum gpio_signal signal)
-{
-	hook_call_deferred(&ps185_hdmi_hpd_deferred_data, PS185_HPD_DEBOUCE);
-}
-
-/* HDMI/TYPE-C function shared subboard interrupt */
-static void x_ec_interrupt(enum gpio_signal signal)
-{
-	int sub = board_get_sub_board();
-
-	if (sub == SUB_BOARD_TYPEC)
-		/* C1: PPC interrupt */
-		syv682x_interrupt(1);
-	else if (sub == SUB_BOARD_HDMI)
-		hdmi_hpd_interrupt(signal);
-	else
-		CPRINTS("Undetected subboard interrupt.");
-}
-
 int ppc_get_alert_status(int port)
 {
 	if (port == 0)
 		return gpio_get_level(GPIO_USB_C0_PPC_INT_ODL) == 0;
-	if (port == 1 && board_get_sub_board() == SUB_BOARD_TYPEC)
-		return gpio_get_level(GPIO_USB_C1_PPC_INT_ODL) == 0;
 
+	/* TODO: add rt1718s */
 	return 0;
 }
 /* SD Card */
diff --git a/baseboard/cherry/baseboard.h b/baseboard/cherry/baseboard.h
index ce3160d083..0611e3dfc7 100644
--- a/baseboard/cherry/baseboard.h
+++ b/baseboard/cherry/baseboard.h
@@ -176,14 +176,6 @@
 	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_MODE_CHANGE) | \
 	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON))
 
-/* GPIO name remapping */
-#define GPIO_EN_HDMI_PWR        GPIO_EC_X_GPIO1
-#define GPIO_USB_C1_FRS_EN      GPIO_EC_X_GPIO1
-#define GPIO_USB_C1_PPC_INT_ODL GPIO_X_EC_GPIO2
-#define GPIO_PS185_EC_DP_HPD    GPIO_X_EC_GPIO2
-#define GPIO_USB_C1_DP_IN_HPD   GPIO_EC_X_GPIO3
-#define GPIO_PS185_PWRDN_ODL    GPIO_EC_X_GPIO3
-
 #ifndef __ASSEMBLER__
 
 #include "gpio_signal.h"
@@ -191,8 +183,8 @@
 
 enum adc_channel {
 	ADC_VBUS,                /* ADC 0 */
-	ADC_BOARD_ID_0,          /* ADC 1 */
-	ADC_BOARD_ID_1,          /* ADC 2 */
+	ADC_BOARD_ID,            /* ADC 1 */
+	ADC_SKU_ID,              /* ADC 2 */
 	ADC_CHARGER_AMON_R,      /* ADC 3 */
 	ADC_CHARGER_PMON,        /* ADC 6 */
 
diff --git a/baseboard/cherry/board_id.c b/baseboard/cherry/board_id.c
index a8bee6d412..e90da11f57 100644
--- a/baseboard/cherry/board_id.c
+++ b/baseboard/cherry/board_id.c
@@ -91,7 +91,7 @@ static int version = -1;
 /* b/163963220: Cache ADC value before board_hibernate_late() reads it */
 static void board_version_init(void)
 {
-	version = adc_value_to_numeric_id(ADC_BOARD_ID_0);
+	version = adc_value_to_numeric_id(ADC_BOARD_ID);
 	if (version < 0) {
 		ccprints("WARN:BOARD_ID_0");
 		ccprints("Assuming board id = 0");
diff --git a/baseboard/cherry/it5205_sbu.h b/baseboard/cherry/it5205_sbu.h
deleted file mode 100644
index 43f226da3b..0000000000
--- a/baseboard/cherry/it5205_sbu.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* 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.
- *
- * IT5205 Type-C SBU OVP handler
- */
-
-#ifndef __CROS_EC_ASURADA_IT5205_SBU_H
-#define __CROS_EC_ASURADA_IT5205_SBU_H
-
-void it5205h_sbu_interrupt(enum gpio_signal signal);
-
-#endif /* __CROS_EC_ASURADA_IT5205_SBU_H */
diff --git a/baseboard/cherry/usb_pd_policy.c b/baseboard/cherry/usb_pd_policy.c
index cc2f9b0336..db15e93567 100644
--- a/baseboard/cherry/usb_pd_policy.c
+++ b/baseboard/cherry/usb_pd_policy.c
@@ -27,7 +27,7 @@ static enum {
 int svdm_get_hpd_gpio(int port)
 {
 	/* HPD is low active, inverse the result */
-	return !gpio_get_level(GPIO_EC_DPBRDG_HPD_ODL);
+	return !gpio_get_level(GPIO_EC_AP_DP_HPD_ODL);
 }
 
 void svdm_set_hpd_gpio(int port, int en)
@@ -36,13 +36,13 @@ void svdm_set_hpd_gpio(int port, int en)
 	 * HPD is low active, inverse the en
 	 * TODO: C0&C1 shares the same HPD, implement FCFS policy.
 	 */
-	gpio_set_level(GPIO_EC_DPBRDG_HPD_ODL, !en);
+	gpio_set_level(GPIO_EC_AP_DP_HPD_ODL, !en);
 }
 
 static void aux_switch_port(int port)
 {
 	if (port != AUX_PORT_NONE)
-		gpio_set_level_verbose(CC_USBPD, GPIO_DP_AUX_PATH_SEL, port);
+		gpio_set_level_verbose(CC_USBPD, GPIO_DP_PATH_SEL, port);
 	aux_port = port;
 }
 
diff --git a/board/cherry/gpio.inc b/board/cherry/gpio.inc
index 1bd0b8ea4a..c85ac8d6f5 100644
--- a/board/cherry/gpio.inc
+++ b/board/cherry/gpio.inc
@@ -10,7 +10,7 @@
 
 /* Wake Source interrupts */
 GPIO_INT(POWER_BUTTON_L,     PIN(E, 4), GPIO_INT_BOTH | GPIO_PULL_UP |
-	 GPIO_HIB_WAKE_HIGH, power_button_interrupt) /* H1_EC_PWR_BTN_ODL */
+	 GPIO_HIB_WAKE_HIGH, power_button_interrupt) /* GSC_EC_PWR_BTN_ODL */
 GPIO_INT(LID_OPEN,           PIN(E, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH,
          lid_interrupt)
 GPIO_INT(TABLET_MODE_L,      PIN(J, 7), GPIO_INT_BOTH,
@@ -29,52 +29,39 @@ GPIO_INT(PMIC_EC_PWRGD, PIN(F, 3),
          GPIO_INT_BOTH | GPIO_PULL_DOWN | GPIO_SEL_1P8V, power_signal_interrupt)
 
 /* Sensor Interrupts */
-GPIO_INT(BASE_IMU_INT_L,     PIN(J, 2), GPIO_INT_FALLING | GPIO_SEL_1P8V,
+GPIO_INT(BASE_IMU_INT_L,     PIN(M, 3), GPIO_INT_FALLING | GPIO_SEL_1P8V,
          bmi160_interrupt)
-GPIO_INT(LID_ACCEL_INT_L,    PIN(J, 3), GPIO_INT_FALLING | GPIO_SEL_1P8V,
+GPIO_INT(LID_ACCEL_INT_L,    PIN(M, 2), GPIO_INT_FALLING | GPIO_SEL_1P8V,
          lis2dw12_interrupt)
-#ifdef BOARD_ASURADA_REV0
-GPIO_INT(ALS_RGB_INT_ODL,    PIN(F, 0), GPIO_INT_FALLING,
-         tcs3400_interrupt)
-#else
-GPIO(ALS_RGB_INT_ODL,        PIN(F, 0), GPIO_INPUT)
-#endif
 
 /* USB-C interrupts */
 GPIO_INT(USB_C0_PPC_INT_ODL, PIN(D, 1), GPIO_INT_BOTH, ppc_interrupt)
-GPIO_INT(USB_C0_BC12_INT_ODL,PIN(J, 6), GPIO_INT_FALLING, bc12_interrupt)
-GPIO_INT(USB_C1_BC12_INT_L,  PIN(J, 4), GPIO_INT_FALLING, bc12_interrupt)
+GPIO_INT(USB_C0_BC12_INT_ODL,PIN(J, 4), GPIO_INT_FALLING, bc12_interrupt)
+/* TODO: rt1718s interrupt, not implemented */
+GPIO(USB_C1_INT_ODL,         PIN(B, 2), GPIO_INPUT | GPIO_INT_FALLING)
 
 /* Volume button interrupts */
-/* Note that netnames are reversed in asurada rev 0/1 */
 GPIO_INT(VOLUME_DOWN_L,      PIN(D, 5), GPIO_INT_BOTH | GPIO_PULL_UP,
          button_interrupt) /* EC_VOLDN_BTN_ODL */
 GPIO_INT(VOLUME_UP_L,        PIN(D, 6), GPIO_INT_BOTH | GPIO_PULL_UP,
          button_interrupt) /* EC_VOLUP_BTN_ODL */
 
 /* Other interrupts */
-#ifdef BOARD_ASURADA_REV0
-GPIO_INT(AC_PRESENT,         PIN(M, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH,
-         extpower_interrupt) /* AC_OK / AC_PRESENT in rev0 */
-#else /* HAYATO */
 GPIO_INT(AC_PRESENT,         PIN(E, 5), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH,
          extpower_interrupt) /* AC_OK / AC_PRESENT in rev1+ */
-#endif
 GPIO_INT(UART1_RX,           PIN(B, 0), GPIO_INT_FALLING,
          uart_deepsleep_interrupt) /* UART_DEBUG_TX_EC_RX */
 GPIO_INT(WP,                 PIN(I, 4), GPIO_INT_BOTH | GPIO_SEL_1P8V,
          switch_interrupt) /* EC_FLASH_WP_OD */
 GPIO_INT(SPI0_CS,            PIN(M, 5), GPIO_INT_FALLING,
          spi_event)        /* SPI slave Chip Select -- AP_SPI_EC_CS_L */
-GPIO_INT(X_EC_GPIO2,         PIN(B, 2), GPIO_ODR_HIGH, x_ec_interrupt)
 
 /* Power Sequencing Signals */
 GPIO(EC_PMIC_EN_ODL,         PIN(D, 0), GPIO_ODR_HIGH | GPIO_SEL_1P8V)
 GPIO(EC_PMIC_WATCHDOG_L,     PIN(H, 0), GPIO_ODR_LOW | GPIO_SEL_1P8V)
 GPIO(EN_PP5000_A,            PIN(C, 6), GPIO_OUT_HIGH)
-GPIO(PG_MT6315_PROC_ODL,     PIN(E, 1), GPIO_INPUT)
+GPIO(PG_MT6315_PROC_B_ODL,   PIN(E, 1), GPIO_INPUT)
 GPIO(PG_MT6360_ODL,          PIN(F, 1), GPIO_INPUT)
-GPIO(PG_PP5000_A_ODL,        PIN(A, 6), GPIO_INPUT)
 GPIO(EN_SLP_Z,               PIN(E, 3), GPIO_OUT_LOW)
 GPIO(SYS_RST_ODL,            PIN(B, 6), GPIO_ODR_LOW)
 GPIO(EC_BL_EN_OD,            PIN(B, 5), GPIO_ODR_LOW | GPIO_SEL_1P8V)
@@ -83,17 +70,29 @@ GPIO(EC_BL_EN_OD,            PIN(B, 5), GPIO_ODR_LOW | GPIO_SEL_1P8V)
 GPIO(EC_INT_L,               PIN(E, 6), GPIO_ODR_HIGH | GPIO_SEL_1P8V) /* EC_AP_INT_ODL */
 
 /* USB and USBC Signals */
-GPIO(DP_AUX_PATH_SEL,        PIN(G, 0), GPIO_OUT_HIGH)
-GPIO(EC_DPBRDG_HPD_ODL,      PIN(J, 0), GPIO_ODR_HIGH | GPIO_SEL_1P8V)
-GPIO(EN_PP5000_USB_A0_VBUS,  PIN(B, 7), GPIO_OUT_LOW)
-GPIO(USB_C0_FRS_EN,          PIN(H, 3), GPIO_OUT_LOW)
+GPIO(DP_PATH_SEL,            PIN(G, 0), GPIO_OUT_HIGH)
+GPIO(DP_DEMUX_EN,            PIN(G, 1), GPIO_OUT_LOW)
+GPIO(EC_AP_DP_HPD_ODL,       PIN(J, 0), GPIO_ODR_HIGH)
+GPIO(EN_PP5000_USB_A0_VBUS_X,PIN(B, 7), GPIO_OUT_LOW)
+GPIO(USB_C0_DP_IN_HPD,       PIN(H, 4), GPIO_OUT_LOW)
+GPIO(USB_C1_DP_IN_HPD,       PIN(J, 1), GPIO_OUT_LOW)
+GPIO(USB_C0_FRS_EN,          PIN(F, 0), GPIO_OUT_LOW)
+
+/* NVME */
+GPIO(EC_NVME_PLN_ODL,        PIN(D, 7), GPIO_ODR_HIGH | GPIO_SEL_1P8V)
+GPIO(NVME_EC_PLA_S3_ODL,     PIN(I, 7), GPIO_INPUT)
+GPIO(EN_PP2500_NVME_X,       PIN(J, 2), GPIO_OUTPUT | GPIO_PULL_DOWN)
+GPIO(EN_PP1200_NVME_X,       PIN(J, 3), GPIO_OUTPUT | GPIO_PULL_DOWN)
+GPIO(EN_PP900_NVME_X,        PIN(J, 5), GPIO_OUTPUT | GPIO_PULL_DOWN)
+GPIO(PG_NVME_OD,             PIN(H, 3), GPIO_INPUT)
 
 /* Misc Signals */
+GPIO(EN_KB_BL,               PIN(A, 5), GPIO_OUTPUT)
 GPIO(EC_BATT_PRES_ODL,       PIN(C, 0), GPIO_INPUT)
-GPIO(BC12_DET_EN,            PIN(J, 5), GPIO_OUT_LOW) /* EN_USB_C0_BC12_DET */
 GPIO(EN_EC_ID_ODL,           PIN(H, 5), GPIO_ODR_LOW)
 GPIO(ENTERING_RW,            PIN(C, 5), GPIO_OUT_LOW) /* EC_ENTERING_RW */
-GPIO(EC_USB_C0_MUX_RESET_L,  PIN(D, 7), GPIO_OUT_HIGH)
+GPIO(EN_5V_USM,              PIN(G, 3), GPIO_OUT_LOW)
+GPIO(USB_A0_FAULT_ODL,       PIN(J, 6), GPIO_INPUT)
 
 /* I2C pins - Alternate function below configures I2C module on these pins */
 GPIO(I2C_A_SCL,              PIN(B, 3), GPIO_INPUT) /* I2C_CHG_BATT_SCL */
@@ -101,19 +100,11 @@ GPIO(I2C_A_SDA,              PIN(B, 4), GPIO_INPUT) /* I2C_CHG_BATT_SDA */
 GPIO(I2C_B_SCL,              PIN(C, 1), GPIO_INPUT | GPIO_SEL_1P8V) /* I2C_SENSOR_SCL */
 GPIO(I2C_B_SDA,              PIN(C, 2), GPIO_INPUT | GPIO_SEL_1P8V) /* I2C_SENSOR_SDA */
 GPIO(I2C_C_SCL,              PIN(F, 6), GPIO_INPUT) /* I2C_USB_C0_SCL */
-GPIO(I2C_C_SDA,              PIN(F, 7), GPIO_INPUT) /* I2C_USB_C0_SCL */
+GPIO(I2C_C_SDA,              PIN(F, 7), GPIO_INPUT) /* I2C_USB_C0_SDA */
 GPIO(I2C_E_SCL,              PIN(E, 0), GPIO_INPUT) /* I2C_USB_C1_SCL */
 GPIO(I2C_E_SDA,              PIN(E, 7), GPIO_INPUT) /* I2C_USB_C1_SDA */
-
-/* SPI pins - Alternate function below configures SPI module on these pins */
-
-/* NC / TP */
-
-/* Keyboard pins */
-
-/* Subboards HDMI/TYPEC */
-GPIO(EC_X_GPIO1,             PIN(H, 4), GPIO_OUT_LOW)
-GPIO(EC_X_GPIO3,             PIN(J, 1), GPIO_INPUT)
+GPIO(I2C_H_SCL,              PIN(H, 1), GPIO_INPUT) /* I2C_PROG_SCL */
+GPIO(I2C_H_SDA,              PIN(H, 2), GPIO_INPUT) /* I2C_PROG_SDA */
 
 /* Alternate functions GPIO definitions */
 ALTERNATE(PIN_MASK(B, 0x18), 1, MODULE_I2C, 0) /* I2C A */
@@ -125,7 +116,7 @@ ALTERNATE(PIN_MASK(E, 0x81), 1, MODULE_I2C, 0) /* I2C E */
 ALTERNATE(PIN_MASK(B, 0x03), 1, MODULE_UART, 0) /* EC to Servo */
 
 /* PWM */
-ALTERNATE(PIN_MASK(A, 0x07), 1, MODULE_PWM, 0) /* PWM 0~2 */
+ALTERNATE(PIN_MASK(A, 0b11011111), 1, MODULE_PWM, 0) /* PWM 0~4,6,7 */
 
 /* ADC */
 ALTERNATE(PIN_MASK(I, 0x4F), 0, MODULE_ADC, 0) /* ADC 0,1,2,3,6 */
@@ -134,15 +125,10 @@ ALTERNATE(PIN_MASK(I, 0x4F), 0, MODULE_ADC, 0) /* ADC 0,1,2,3,6 */
 ALTERNATE(PIN_MASK(M, 0x33), 0, MODULE_SPI, 0) /* SPI */
 
 /* Unimplemented Pins  */
-GPIO(SET_VMC_VOLT_AT_1V8,    PIN(D, 4), GPIO_INPUT | GPIO_PULL_DOWN | GPIO_SEL_1P8V)
-GPIO(EN_PP3000_VMC_PMU,      PIN(D, 2), GPIO_INPUT | GPIO_PULL_DOWN | GPIO_SEL_1P8V)
-GPIO(PACKET_MODE_EN,         PIN(A, 3), GPIO_INPUT | GPIO_PULL_DOWN)
-/* b/160218054: behavior not defined */
+GPIO(PG_PP5000_S5_OD,        PIN(D, 2), GPIO_INPUT)
+GPIO(EC_GSC_PACKET_MODE,     PIN(D, 4), GPIO_INPUT | GPIO_PULL_DOWN)
 /* *_ODL pin has external pullup so don't pull it down. */
-GPIO(USB_A0_FAULT_ODL,       PIN(A, 7), GPIO_INPUT)
-GPIO(CHARGER_PROCHOT_ODL,    PIN(C, 3), GPIO_INPUT)
 GPIO(PG_MT6315_GPU_ODL,      PIN(H, 6), GPIO_INPUT)
-GPIO(EN_PP3000_SD_U,         PIN(G, 1), GPIO_INPUT | GPIO_PULL_DOWN | GPIO_SEL_1P8V)
 /* reserved for future use */
 GPIO(CCD_MODE_ODL,           PIN(C, 4), GPIO_INPUT)
 /*
@@ -150,21 +136,13 @@ GPIO(CCD_MODE_ODL,           PIN(C, 4), GPIO_INPUT)
  * so we set them as output low.
  */
 GPIO(NC_GPI5,                PIN(I, 5), GPIO_OUT_LOW)
-GPIO(NC_GPI7,                PIN(I, 7), GPIO_OUT_LOW)
 /* NC pins, enable internal pull-up/down to avoid floating state. */
-#ifdef BOARD_ASURADA_REV0
-GPIO(NC_GPE5,                PIN(E, 5), GPIO_INPUT | GPIO_PULL_UP)
-#else /* HAYATO */
-GPIO(NC_GPM2,                PIN(M, 2), GPIO_INPUT | GPIO_PULL_DOWN)
-#endif
-GPIO(NC_GPM3,                PIN(M, 3), GPIO_INPUT | GPIO_PULL_DOWN)
 GPIO(NC_GPM6,                PIN(M, 6), GPIO_INPUT | GPIO_PULL_DOWN)
 GPIO(SPI_CLK_GPG6,           PIN(G, 6), GPIO_INPUT | GPIO_PULL_UP)
 /*
  * These 4 pins don't have internal pull-down capability,
  * so we set them as output low.
  */
-GPIO(NC_GPG3,                PIN(G, 3), GPIO_OUT_LOW)
 GPIO(SPI_MOSI_GPG4,          PIN(G, 4), GPIO_OUT_LOW)
 GPIO(SPI_MISO_GPG5,          PIN(G, 5), GPIO_OUT_LOW)
 GPIO(SPI_CS_GPG7,            PIN(G, 7), GPIO_OUT_LOW)