From 26c440050ca04e73a1014f69adb3b328b7387169 Mon Sep 17 00:00:00 2001 From: Reka Norman Date: Wed, 13 Sep 2023 15:10:35 +1000 Subject: [PATCH] mb/google/dedede: Update dibbi ec.h settings Update the dibbi ec.h so that it's correct for a chromebox. Remove everything related to: - Lid - Battery - Built-in keyboard - AC connect/disconnect - Mode changes BUG=b:294963793 TEST=Boot dibbi and check the APCI tables no longer contain lid and PS/2 keyboard devices. Change-Id: Idfa5adcec308d68555d292fddc1db43c9a64d649 Signed-off-by: Reka Norman Reviewed-on: https://review.coreboot.org/c/coreboot/+/77863 Reviewed-by: Sam McNally Reviewed-by: Eric Lai Reviewed-by: Sheng-Liang Pan Tested-by: build bot (Jenkins) --- .../baseboard/include/baseboard/dibbi/ec.h | 42 ++++--------------- 1 file changed, 7 insertions(+), 35 deletions(-) diff --git a/src/mainboard/google/dedede/variants/baseboard/include/baseboard/dibbi/ec.h b/src/mainboard/google/dedede/variants/baseboard/include/baseboard/dibbi/ec.h index 1e4ac0bbb7..48e2608741 100644 --- a/src/mainboard/google/dedede/variants/baseboard/include/baseboard/dibbi/ec.h +++ b/src/mainboard/google/dedede/variants/baseboard/include/baseboard/dibbi/ec.h @@ -8,56 +8,30 @@ #include #define MAINBOARD_EC_SCI_EVENTS \ - (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_CLOSED) |\ - EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN) |\ - EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_CONNECTED) |\ - EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_DISCONNECTED) |\ - EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY_LOW) |\ - EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY_CRITICAL) |\ - EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY) |\ - EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY_STATUS) |\ - EC_HOST_EVENT_MASK(EC_HOST_EVENT_THERMAL_THRESHOLD) |\ + (EC_HOST_EVENT_MASK(EC_HOST_EVENT_THERMAL_THRESHOLD) |\ EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_START) |\ EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_STOP) |\ EC_HOST_EVENT_MASK(EC_HOST_EVENT_MKBP) |\ EC_HOST_EVENT_MASK(EC_HOST_EVENT_PD_MCU) |\ - EC_HOST_EVENT_MASK(EC_HOST_EVENT_MODE_CHANGE) |\ EC_HOST_EVENT_MASK(EC_HOST_EVENT_PANIC)) -#define MAINBOARD_EC_SMI_EVENTS \ - (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_CLOSED)) +#define MAINBOARD_EC_SMI_EVENTS 0 -/* EC can wake from S5 with lid or power button */ +/* EC can wake from S5 with power button */ #define MAINBOARD_EC_S5_WAKE_EVENTS \ - (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN) |\ - EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON)) + (EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON)) -/* - * EC can wake from S3/S0ix with: - * 1. Lid open - * 2. Power button - * 3. Key press - * 4. Mode change - * 5. AC Connect/Disconnect - * 6. Low battery - */ +/* EC can wake from S3/S0ix with power button */ #define MAINBOARD_EC_S3_WAKE_EVENTS \ - (MAINBOARD_EC_S5_WAKE_EVENTS |\ - EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_CONNECTED) |\ - EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_DISCONNECTED) |\ - EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEY_PRESSED) |\ - EC_HOST_EVENT_MASK(EC_HOST_EVENT_MODE_CHANGE)) + (MAINBOARD_EC_S5_WAKE_EVENTS) #define MAINBOARD_EC_S0IX_WAKE_EVENTS \ (MAINBOARD_EC_S3_WAKE_EVENTS |\ - EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY_CRITICAL) |\ - EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY_SHUTDOWN) |\ EC_HOST_EVENT_MASK(EC_HOST_EVENT_HANG_DETECT)) /* Log EC wake events plus EC shutdown events */ #define MAINBOARD_EC_LOG_EVENTS \ (EC_HOST_EVENT_MASK(EC_HOST_EVENT_THERMAL_SHUTDOWN) |\ - EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY_SHUTDOWN) |\ EC_HOST_EVENT_MASK(EC_HOST_EVENT_PANIC)) /* @@ -67,8 +41,7 @@ /* Enable MKBP for buttons and switches */ #define EC_ENABLE_MKBP_DEVICE -/* Enable LID switch and provide wake pin for EC */ -#define EC_ENABLE_LID_SWITCH +/* Provide wake pin for EC */ #define EC_ENABLE_WAKE_PIN GPE_EC_WAKE /* Enable EC backed PD MCU device in ACPI */ @@ -76,7 +49,6 @@ #define SIO_EC_MEMMAP_ENABLE /* EC Memory Map Resources */ #define SIO_EC_HOST_ENABLE /* EC Host Interface Resources */ -#define SIO_EC_ENABLE_PS2K /* Enable PS/2 Keyboard */ /* Enable EC SYNC IRQ, EC_SYNC_IRQ is defined in baseboard/gpio.h */ #define EC_ENABLE_SYNC_IRQ