Hades: Configure GPIOs

This CL configures GPIO pins according to the latest schematics.

This includes the following changes:

* GPIOE4: EC_I2C_USBA_RT_SCL --> Unused
* GPIOE3: EC_I2C_USBA_RT_SDA --> IMVP91_PE_EC
* GPIO86: EC_KB_BL_EN --> Unused
* GPIOB5: PG_PP3300_S5_EC_SEQ_OD --> EN_USB_C1_28V
* GPIOB4: PG_PP3300_S5_OD --> GPIO_ODR_HIGH (for b:279214842)
* GPIOF2, GPIOF3: I2C4 --> USB_C0_PPC_HI_ILIM
* GPIOF0/ADC9: --> ADC_USB_C1_VBUSM
* GPIOD0, GPIOD1: --> Unused
* GPIOB4: Unused --> PG_PP3300_S5_OD
* GPIOE1: Unused --> TEMP_SENSOR_4
* GPIO60, GPIOC2: Unused --> LED3, LED4
* GPIO57: Unused --> SER_IRQ/ESPI_ALERT_L

BUG=b:272815831
BRANCH=None
TEST=make BOARD=hades

Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Change-Id: I37a2bccdd5ce16c7dcbb86c1811f9cd7024ecb20
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4455302
Reviewed-by: David Huang <david.huang@quanta.corp-partner.google.com>
Reviewed-by: Tarun Tuli <taruntuli@google.com>

7 files changed, 70 insertions, 83 deletions

diff --git a/board/hades/board.c b/board/hades/board.c
index f06a6f52dc..897b7fb546 100644
--- a/board/hades/board.c
+++ b/board/hades/board.c
@@ -52,7 +52,7 @@ __override void board_cbi_init(void)
 static void board_chipset_resume(void)
 {
 	/* Allow keyboard backlight to be enabled */
-	gpio_set_level(GPIO_EC_KB_BL_EN, 1);
+	gpio_set_level(GPIO_EN_EC_KB_BL_L, 1);
 }
 DECLARE_HOOK(HOOK_CHIPSET_RESUME, board_chipset_resume, HOOK_PRIO_DEFAULT);
 
@@ -60,7 +60,7 @@ DECLARE_HOOK(HOOK_CHIPSET_RESUME, board_chipset_resume, HOOK_PRIO_DEFAULT);
 static void board_chipset_suspend(void)
 {
 	/* Turn off the keyboard backlight if it's on. */
-	gpio_set_level(GPIO_EC_KB_BL_EN, 0);
+	gpio_set_level(GPIO_EN_EC_KB_BL_L, 0);
 }
 DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, board_chipset_suspend, HOOK_PRIO_DEFAULT);
 
@@ -71,49 +71,13 @@ static void board_init(void)
 		CPRINTS("PG_PP3300_S5_OD block is enabled");
 		block_sequence = 1;
 	}
-	gpio_enable_interrupt(GPIO_PG_PP3300_S5_OD);
+
 	gpio_enable_interrupt(GPIO_BJ_ADP_PRESENT_ODL);
 
 	nvidia_gpu_init_policy(d_notify_policies);
 }
 DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT);
 
-/**
- * Deferred function to handle GPIO PG_PP3300_S5_OD change
- */
-static void bypass_pp3300_s5_deferred(void)
-{
-	if (block_sequence) {
-		CPRINTS("PG_PP3300_S5_OD is blocked.");
-		return;
-	}
-
-	gpio_set_level(GPIO_PG_PP3300_S5_EC_SEQ_OD,
-		       gpio_get_level(GPIO_PG_PP3300_S5_OD));
-}
-DECLARE_DEFERRED(bypass_pp3300_s5_deferred);
-
-void board_power_interrupt(enum gpio_signal signal)
-{
-	/* Trigger deferred notification of gpio PG_PP3300_S5_OD change */
-	hook_call_deferred(&bypass_pp3300_s5_deferred_data, 0);
-}
-
-static int cc_blockseq(int argc, const char *argv[])
-{
-	if (argc > 1) {
-		if (!parse_bool(argv[1], &block_sequence)) {
-			ccprintf("Invalid argument: %s\n", argv[1]);
-			return EC_ERROR_INVAL;
-		}
-	}
-
-	ccprintf("PG_PP3300_S5_OD block is %s\n",
-		 block_sequence ? "enabled" : "disabled");
-	return EC_SUCCESS;
-}
-DECLARE_CONSOLE_COMMAND(blockseq, cc_blockseq, "[on/off]", NULL);
-
 void gpu_overt_interrupt(enum gpio_signal signal)
 {
 	nvidia_gpu_over_temp(gpio_get_level(signal));
diff --git a/board/hades/board.h b/board/hades/board.h
index 3c88c04d1d..8402edeb0e 100644
--- a/board/hades/board.h
+++ b/board/hades/board.h
@@ -162,10 +162,12 @@
 
 enum adc_channel {
 	ADC_TEMP_SENSOR_1_DDR_SOC,
-	ADC_TEMP_SENSOR_2_GPU,
+	ADC_TEMP_SENSOR_2_FAN,
 	ADC_TEMP_SENSOR_3_CHARGER,
+	ADC_TEMP_SENSOR_4_GPU_FBVDD,
 	ADC_CHARGER_IADP,
 	ADC_ADP_TYP,
+	ADC_USB_C1_VBUSM,
 	ADC_CH_COUNT
 };
 
@@ -173,6 +175,7 @@ enum temp_sensor_id {
 	TEMP_SENSOR_1_DDR_SOC,
 	TEMP_SENSOR_2_GPU,
 	TEMP_SENSOR_3_CHARGER,
+	TEMP_SENSOR_4_GPU_FBVDD,
 	TEMP_SENSOR_COUNT
 };
 
diff --git a/board/hades/fans.c b/board/hades/fans.c
index 0a734331aa..337ac21418 100644
--- a/board/hades/fans.c
+++ b/board/hades/fans.c
@@ -39,7 +39,7 @@ static const struct fan_conf fan_conf_1 = {
 	.flags = FAN_USE_RPM_MODE,
 	.ch = MFT_CH_1, /* Use MFT id to control fan */
 	.pgood_gpio = -1,
-	.enable_gpio = GPIO_EN_PP5000_FAN2,
+	.enable_gpio = GPIO_EN_PP12000_FAN_X,
 };
 
 static const struct fan_rpm fan_rpm_0 = {
diff --git a/board/hades/gpio.inc b/board/hades/gpio.inc
index c9c53d7dfe..86da520097 100644
--- a/board/hades/gpio.inc
+++ b/board/hades/gpio.inc
@@ -21,11 +21,11 @@ GPIO_INT(SLP_SUS_L,                      PIN(F, 1), GPIO_INT_BOTH, power_signal_
 GPIO_INT(SYS_SLP_S0IX_L,                 PIN(D, 5), GPIO_INT_BOTH, power_signal_interrupt)
 GPIO_INT(USB_C0_BC12_INT_ODL,            PIN(C, 6), GPIO_INT_FALLING, bc12_interrupt)
 GPIO_INT(USB_C0_TCPC_INT_ODL,            PIN(E, 0), GPIO_INT_FALLING, tcpc_alert_event)
-GPIO_INT(USB_C0_PPC_INT_ODL,             PIN(6, 2), GPIO_INT_FALLING, ppc_interrupt)
-GPIO_INT(PG_PP3300_S5_OD,                PIN(B, 4), GPIO_INT_BOTH | GPIO_PULL_UP, board_power_interrupt)
+GPIO_INT(USB_C0_PPC_INT_ODL,             PIN(A, 7), GPIO_INT_FALLING, ppc_interrupt)
+GPIO_INT(USB_C0_IN_HPD,                  PIN(6, 2), GPIO_INT_FALLING, ppc_interrupt)
 GPIO_INT(USB_C1_BC12_INT_ODL,            PIN(8, 3), GPIO_INT_FALLING, bc12_interrupt)
-GPIO_INT(USB_C1_TCPC_INT_ODL,            PIN(A, 7), GPIO_INT_FALLING, tcpc_alert_event)
-GPIO_INT(USB_C1_PPC_INT_ODL,             PIN(7, 0), GPIO_INT_FALLING, ppc_interrupt)
+GPIO_INT(USB_C1_TCPC_INT_ODL,            PIN(7, 0), GPIO_INT_FALLING, tcpc_alert_event)
+GPIO_INT(USB_C1_PPC_INT_ODL,             PIN(B, 1), GPIO_INT_FALLING, ppc_interrupt)
 GPIO_INT(BJ_ADP_PRESENT_ODL,             PIN(9, 5), GPIO_INT_BOTH | GPIO_PULL_UP, bj_present_interrupt)
 GPIO_INT(GPU_OVERT_ODL,                  PIN(5, 0), GPIO_INT_BOTH, gpu_overt_interrupt)
 
@@ -44,9 +44,8 @@ GPIO(EC_I2C_USB_C1_SCL,              PIN(9, 2), GPIO_INPUT)
 GPIO(EC_I2C_USB_C1_SDA,              PIN(9, 1), GPIO_INPUT)
 GPIO(EC_I2C_USB_C0_SCL,              PIN(9, 0), GPIO_INPUT)
 GPIO(EC_I2C_USB_C0_SDA,              PIN(8, 7), GPIO_INPUT)
-GPIO(EC_I2C_USBA_RT_SCL,             PIN(E, 4), GPIO_INPUT)
-GPIO(EC_I2C_USBA_RT_SDA,             PIN(E, 3), GPIO_INPUT)
-GPIO(EC_KB_BL_EN,                    PIN(8, 6), GPIO_OUT_LOW)
+GPIO(EN_EC_KB_BL_L,                  PIN(8, 6), GPIO_ODR_HIGH)
+GPIO(IMVP91_PE_EC,                   PIN(E, 3), GPIO_OUT_LOW)
 GPIO(EC_PCHHOT_ODL,                  PIN(7, 4), GPIO_INPUT)
 GPIO(EC_PCH_INT_ODL,                 PIN(B, 0), GPIO_ODR_HIGH)
 GPIO(EC_PCH_PWR_BTN_ODL,             PIN(C, 1), GPIO_ODR_HIGH)
@@ -56,23 +55,27 @@ GPIO(EC_PCH_SYS_PWROK,               PIN(3, 7), GPIO_OUT_LOW)
 GPIO(EC_PCH_WAKE_R_ODL,              PIN(C, 0), GPIO_ODR_HIGH)
 GPIO(EC_PROCHOT_ODL,                 PIN(6, 3), GPIO_ODR_HIGH)
 GPIO(EN_PP5000_FAN,                  PIN(6, 1), GPIO_OUT_LOW)
-GPIO(EN_PP5000_FAN2,                 PIN(F, 5), GPIO_OUT_LOW)
+GPIO(EN_PP12000_FAN_X,               PIN(F, 5), GPIO_OUT_LOW)
 GPIO(EN_PP5000_USBA_R,               PIN(D, 7), GPIO_OUT_LOW)
 GPIO(EN_S5_RAILS,                    PIN(9, 6), GPIO_OUT_LOW)
 GPIO(IMVP9_VRRDY_OD,                 PIN(4, 3), GPIO_INPUT)
 GPIO(PCH_PWROK,                      PIN(7, 2), GPIO_OUT_LOW)
 GPIO(SYS_RST_ODL,                    PIN(C, 5), GPIO_ODR_HIGH)
 GPIO(EC_USB_PCH_C0_OC_ODL,           PIN(9, 4), GPIO_ODR_HIGH)
-GPIO(EC_USB_PCH_C2_OC_ODL,           PIN(9, 7), GPIO_ODR_HIGH)
+GPIO(EC_USB_PCH_C1_OC_ODL,           PIN(9, 7), GPIO_ODR_HIGH)
 GPIO(VCCST_PWRGD_OD,                 PIN(A, 4), GPIO_ODR_LOW)
 GPIO(EN_USB_A_LOW_POWER,             PIN(9, 3), GPIO_OUT_LOW)
-GPIO(PG_PP3300_S5_EC_SEQ_OD,         PIN(B, 5), GPIO_OUT_LOW)
-GPIO(USB_C1_FRS_EN,                  PIN(D, 4), GPIO_OUT_LOW)
+GPIO(EN_USB_C1_28V,                  PIN(B, 5), GPIO_OUT_LOW)
+GPIO(USB_C0_TCPC_RST_ODL,            PIN(D, 4), GPIO_ODR_LOW)
 GPIO(NVIDIA_GPU_ACOFF_ODL,           PIN(5, 6), GPIO_ODR_HIGH)
 GPIO(LED_4_L,                        PIN(6, 0), GPIO_OUT_LOW)
 GPIO(LED_3_L,                        PIN(C, 2), GPIO_OUT_LOW)
 GPIO(LED_2_L,                        PIN(C, 3), GPIO_OUT_LOW)
 GPIO(LED_1_L,                        PIN(C, 4), GPIO_OUT_LOW)
+GPIO(USB_C0_PPC_HI_ILIM,             PIN(F, 2), GPIO_OUT_HIGH)
+GPIO(USB_C1_PPC_HI_ILIM,             PIN(F, 3), GPIO_OUT_HIGH)
+/* Block AP power sequencing (b/279214842) */
+GPIO(PG_PP3300_S5_OD,                PIN(B, 4), GPIO_ODR_HIGH)
 
 /*
  * Barrel-jack adapter enable switch. When starting up on a depleted battery,
@@ -89,27 +92,29 @@ GPIO(EN_PPVAR_BJ_ADP_L,              PIN(A, 2), GPIO_OUT_LOW)
 GPIO(EC_KSO_02_INV,               PIN(1, 7), GPIO_OUT_LOW)
 
 /* UART alternate functions */
-ALTERNATE(PIN_MASK(6, 0x30), 0, MODULE_UART, 0)              /* GPIO64/CR_SIN1, GPO65/CR_SOUT1/FLPRG1_L */
+ALTERNATE(PIN_MASK(6, 0x30), 0, MODULE_UART, 0) /* GPIO64/CR_SIN1, GPO65/CR_SOUT1/FLPRG1_L */
 
 /* I2C alternate functions */
-ALTERNATE(PIN_MASK(3, 0x48), 0, MODULE_I2C, 0)               /* GPIO33/I2C5_SCL0/CTS_L, GPIO36/RTS_L/I2C5_SDA0 */
-ALTERNATE(PIN_MASK(8, 0x80), 0, MODULE_I2C, 0)               /* GPIO87/I2C1_SDA0 */
-ALTERNATE(PIN_MASK(9, 0x07), 0, MODULE_I2C, 0)               /* GPIO92/I2C2_SCL0, GPIO91/I2C2_SDA0, GPIO90/I2C1_SCL0 */
-ALTERNATE(PIN_MASK(B, 0x0c), 0, MODULE_I2C, 0)               /* GPIOB3/I2C7_SCL0/DCD_L, GPIOB2/I2C7_SDA0/DSR_L */
-ALTERNATE(PIN_MASK(D, 0x03), 0, MODULE_I2C, 0)               /* GPIOD1/I2C3_SCL0, GPIOD0/I2C3_SDA0 */
-ALTERNATE(PIN_MASK(E, 0x18), 0, MODULE_I2C, 0)               /* GPIOE4/I2C6_SCL1/I3C_SCL, GPIOE3/I2C6_SDA1/I3C_SDA */
-ALTERNATE(PIN_MASK(F, 0x0c), 0, MODULE_I2C, 0)               /* GPIOF3/I2C4_SCL1, GPIOF2/I2C4_SDA1 */
+ALTERNATE(PIN_MASK(3, 0x48), 0, MODULE_I2C, 0)  /* GPIO33/I2C5_SCL0/CTS_L, GPIO36/RTS_L/I2C5_SDA0 */
+ALTERNATE(PIN_MASK(8, 0x80), 0, MODULE_I2C, 0)  /* GPIO87/I2C1_SDA0 */
+ALTERNATE(PIN_MASK(9, 0x07), 0, MODULE_I2C, 0)  /* GPIO92/I2C2_SCL0, GPIO91/I2C2_SDA0, GPIO90/I2C1_SCL0 */
+ALTERNATE(PIN_MASK(B, 0x0c), 0, MODULE_I2C, 0)  /* GPIOB3/I2C7_SCL0/DCD_L, GPIOB2/I2C7_SDA0/DSR_L */
 
 /* PWM alternate functions */
-ALTERNATE(PIN_MASK(4, 0x01), 0, MODULE_PWM, 0)               /* GPIO40/TA1 */
-ALTERNATE(PIN_MASK(7, 0x08), 0, MODULE_PWM, 0)               /* GPIO73/TA2 */
-ALTERNATE(PIN_MASK(8, 0x01), 0, MODULE_PWM, 0)               /* GPIO80/PWM3 */
-ALTERNATE(PIN_MASK(B, 0xC0), 0, MODULE_PWM, 0)               /* GPIOB7/PWM5, GPIOB6/PWM4 */
+ALTERNATE(PIN_MASK(4, 0x01), 0, MODULE_PWM, 0)  /* GPIO40/TA1 EC_FAN1_TACH */
+ALTERNATE(PIN_MASK(7, 0x08), 0, MODULE_PWM, 0)  /* GPIO73/TA2 EC_FAN2_TACH */
+ALTERNATE(PIN_MASK(8, 0x01), 0, MODULE_PWM, 0)  /* GPIO80/PWM3 EC_KB_BL_PWM */
+ALTERNATE(PIN_MASK(B, 0xC0), 0, MODULE_PWM, 0)  /* GPIOB7/PWM5=FAN1_PWM,
+                                                   GPIOB6/PWM4=FAN2_PWM */
 
 /* ADC alternate functions */
-ALTERNATE(PIN_MASK(3, 0x10), 0, MODULE_ADC, 0)               /* GPIO34/PS2_DAT2/ADC6 */
-ALTERNATE(PIN_MASK(4, 0x36), 0, MODULE_ADC, 0)               /* GPIO42/ADC3/RI_L, GPIO45/ADC0, GPIO44/ADC1, GPIO41/ADC4 */
-/* TODO: GPIOF0/ADC9 for USB_C1_VBUSM */
+ALTERNATE(PIN_MASK(3, 0x10), 0, MODULE_ADC, 0)  /* GPIO34/PS2_DAT2/ADC6=TEMP_SENSOR_3 */
+ALTERNATE(PIN_MASK(4, 0x36), 0, MODULE_ADC, 0)  /* GPIO42/ADC3/RI_L=CHARGER_IADP_R,
+                                                   GPIO45/ADC0=TEMP_SENSOR_1,
+                                                   GPIO44/ADC1=TEMP_SENSOR_2,
+                                                   GPIO41/ADC4=ADP_TYP. */
+ALTERNATE(PIN_MASK(E, 0x02), 0, MODULE_ADC, 0)  /* GPIOE1/ADC7=TEMP_SENSOR_4 */
+ALTERNATE(PIN_MASK(F, 0x01), 0, MODULE_ADC, 0)  /* GPIOF0/ADC9=USB_C1_VBUSM */
 
 /* KB alternate functions */
 ALTERNATE(PIN_MASK(0, 0xf0), 0, MODULE_KB, GPIO_ODR_HIGH)    /* KSO10&P80_CLK/GPIO07, KSO11&P80_DAT/GPIO06, KSO12/GPIO05, KSO13/GPIO04 */
@@ -126,10 +131,13 @@ ALTERNATE(PIN_MASK(D, 0x04), 0, MODULE_PMU, GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH)
 
 /* Unused Pins */
 UNUSED(PIN(D, 6))       /* GPOD6/CR_SOUT3/SHDF_ESPI_L */
+UNUSED(PIN(D, 0))
+UNUSED(PIN(D, 1))
 UNUSED(PIN(3, 2))       /* GPO32/TRIS_L */
 UNUSED(PIN(3, 5))       /* GPO35/CR_SOUT4/TEST_L */
-UNUSED(PIN(0, 2))       /* GPIO02 */
 UNUSED(PIN(6, 6))       /* GPIO66 */
-UNUSED(PIN(5, 7))       /* GPIO57/SER_IRQ/ESPI_ALERT_L */
 UNUSED(PIN(8, 1))       /* GPIO81 */
 UNUSED(PIN(E, 1))       /* GPIOE1 */
+UNUSED(PIN(E, 4))
+UNUSED(PIN(0, 2))       /* USB_C1_TCPC_RST_ODL. Not connected because R564 is
+                           DNS. */
diff --git a/board/hades/i2c.c b/board/hades/i2c.c
index 6bdbfda2f2..6580aab64a 100644
--- a/board/hades/i2c.c
+++ b/board/hades/i2c.c
@@ -32,21 +32,13 @@ const struct i2c_port_t i2c_ports[] = {
 		/* I2C5 */
 		.name = "battery",
 		.port = I2C_PORT_BATTERY,
-		.kbps = 100,
+		.kbps = 400,
 		.scl = GPIO_EC_I2C_BAT_SCL,
 		.sda = GPIO_EC_I2C_BAT_SDA,
 	},
 	{
-		/* I2C6 */
-		.name = "usba1",
-		.port = I2C_PORT_USBA1_RT,
-		.kbps = 400,
-		.scl = GPIO_EC_I2C_USBA_RT_SCL,
-		.sda = GPIO_EC_I2C_USBA_RT_SDA,
-	},
-	{
 		/* I2C7 */
-		.name = "eeprom",
+		.name = "misc",
 		.port = I2C_PORT_EEPROM,
 		.kbps = 400,
 		.scl = GPIO_EC_I2C_MISC_SCL_R,
diff --git a/board/hades/sensors.c b/board/hades/sensors.c
index 37b2d6c9c6..87d1e2a625 100644
--- a/board/hades/sensors.c
+++ b/board/hades/sensors.c
@@ -19,8 +19,8 @@ struct adc_t adc_channels[] = {
 		.factor_div = ADC_READ_MAX + 1,
 		.shift = 0,
 	},
-	[ADC_TEMP_SENSOR_2_GPU] = {
-		.name = "TEMP_GPU",
+	[ADC_TEMP_SENSOR_2_FAN] = {
+		.name = "TEMP_FAN",
 		.input_ch = NPCX_ADC_CH1,
 		.factor_mul = ADC_MAX_VOLT,
 		.factor_div = ADC_READ_MAX + 1,
@@ -33,6 +33,13 @@ struct adc_t adc_channels[] = {
 		.factor_div = ADC_READ_MAX + 1,
 		.shift = 0,
 	},
+	[ADC_TEMP_SENSOR_4_GPU_FBVDD] = {
+		.name = "TEMP_GPU_FBVDD",
+		.input_ch = NPCX_ADC_CH7,
+		.factor_mul = ADC_MAX_VOLT,
+		.factor_div = ADC_READ_MAX + 1,
+		.shift = 0,
+	},
 	[ADC_CHARGER_IADP] = {
 		.name = "CHARGER_IADP",
 		.input_ch = NPCX_ADC_CH3,
@@ -47,6 +54,13 @@ struct adc_t adc_channels[] = {
 		.factor_div = ADC_READ_MAX + 1,
 		.shift = 0,
 	},
+	[ADC_USB_C1_VBUSM] = {
+		.name = "USB_C1_VBUSM",
+		.input_ch = NPCX_ADC_CH9,
+		.factor_mul = ADC_MAX_VOLT,
+		.factor_div = ADC_READ_MAX + 1,
+		.shift = 0,
+	},
 };
 BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT);
 
@@ -62,7 +76,7 @@ const struct temp_sensor_t temp_sensors[] = {
 		.name = "GPU",
 		.type = TEMP_SENSOR_TYPE_BOARD,
 		.read = get_temp_3v3_30k9_47k_4050b,
-		.idx = ADC_TEMP_SENSOR_2_GPU,
+		.idx = ADC_TEMP_SENSOR_2_FAN,
 	},
 	[TEMP_SENSOR_3_CHARGER] = {
 		.name = "Charger",
@@ -70,6 +84,12 @@ const struct temp_sensor_t temp_sensors[] = {
 		.read = get_temp_3v3_30k9_47k_4050b,
 		.idx = ADC_TEMP_SENSOR_3_CHARGER,
 	},
+	[TEMP_SENSOR_4_GPU_FBVDD] = {
+		.name = "GPU FBVDD",
+		.type = TEMP_SENSOR_TYPE_BOARD,
+		.read = get_temp_3v3_30k9_47k_4050b,
+		.idx = ADC_TEMP_SENSOR_4_GPU_FBVDD,
+	},
 };
 BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT);
 
@@ -131,5 +151,6 @@ struct ec_thermal_config thermal_params[] = {
 	[TEMP_SENSOR_1_DDR_SOC] = THERMAL_CPU,
 	[TEMP_SENSOR_2_GPU] = THERMAL_GPU,
 	[TEMP_SENSOR_3_CHARGER] = THERMAL_CHARGER,
+	[TEMP_SENSOR_4_GPU_FBVDD] = THERMAL_GPU,
 };
 BUILD_ASSERT(ARRAY_SIZE(thermal_params) == TEMP_SENSOR_COUNT);
diff --git a/board/hades/usbc_config.c b/board/hades/usbc_config.c
index 7448204aa2..5c933b5633 100644
--- a/board/hades/usbc_config.c
+++ b/board/hades/usbc_config.c
@@ -79,7 +79,6 @@ struct ppc_config_t ppc_chips[] = {
 		.i2c_port = I2C_PORT_USB_C1_PPC,
 		.i2c_addr_flags = SYV682X_ADDR2_FLAGS,
 		.drv = &syv682x_drv,
-		.frs_en = GPIO_USB_C1_FRS_EN,
 	},
 };