From 6d2d8ea80a6cfbc4af4ec8d804368a41d9eef6a0 Mon Sep 17 00:00:00 2001 From: Karthikeyan Ramasubramanian Date: Mon, 20 Mar 2023 12:24:25 -0600 Subject: [PATCH] mb/google/skyrim: Remove unused sleep GPIO table On Skyrim, there isn't a need for a sleep GPIO table. Remove the TODO and filler table and function to reduce unnecessary function overhead. BUG=None BRANCH=Skyrim TEST=Build Skyrim BIOS image. Change-Id: Ia9d55a5e2295bb2e2c2957c4f5207362f616022c Signed-off-by: Karthikeyan Ramasubramanian Reviewed-on: https://review.coreboot.org/c/coreboot/+/73852 Tested-by: build bot (Jenkins) Reviewed-by: Jon Murphy --- src/mainboard/google/skyrim/variants/baseboard/gpio.c | 11 ----------- .../variants/baseboard/include/baseboard/variants.h | 3 --- .../google/skyrim/variants/baseboard/smihandler.c | 6 ------ 3 files changed, 20 deletions(-) diff --git a/src/mainboard/google/skyrim/variants/baseboard/gpio.c b/src/mainboard/google/skyrim/variants/baseboard/gpio.c index 932acaaee6..969a99537d 100644 --- a/src/mainboard/google/skyrim/variants/baseboard/gpio.c +++ b/src/mainboard/google/skyrim/variants/baseboard/gpio.c @@ -168,11 +168,6 @@ static const struct soc_amd_gpio tpm_gpio_table[] = { PAD_INT(GPIO_18, PULL_NONE, EDGE_LOW, STATUS_DELIVERY), }; -/* GPIO configuration for sleep */ -static const struct soc_amd_gpio sleep_gpio_table[] = { - /* TODO: Fill sleep gpio configuration */ -}; - /* GPIO configuration in bootblock */ static const struct soc_amd_gpio bootblock_gpio_table[] = { /* Enable WLAN */ @@ -252,12 +247,6 @@ __weak void variant_early_override_gpio_table(const struct soc_amd_gpio **gpio, *gpio = NULL; } -__weak void variant_sleep_gpio_table(const struct soc_amd_gpio **gpio, size_t *size) -{ - *size = ARRAY_SIZE(sleep_gpio_table); - *gpio = sleep_gpio_table; -} - __weak void variant_espi_gpio_table(const struct soc_amd_gpio **gpio, size_t *size) { *size = ARRAY_SIZE(espi_gpio_table); diff --git a/src/mainboard/google/skyrim/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/skyrim/variants/baseboard/include/baseboard/variants.h index a340530be7..e49b7c4e80 100644 --- a/src/mainboard/google/skyrim/variants/baseboard/include/baseboard/variants.h +++ b/src/mainboard/google/skyrim/variants/baseboard/include/baseboard/variants.h @@ -29,9 +29,6 @@ void variant_early_gpio_table(const struct soc_amd_gpio **gpio, size_t *size); /* This function allows variant to override any early GPIO init in early bootblock or psp. */ void variant_early_override_gpio_table(const struct soc_amd_gpio **gpio, size_t *size); -/* This function provides GPIO settings before entering sleep. */ -void variant_sleep_gpio_table(const struct soc_amd_gpio **gpio, size_t *size); - /* This function provides GPIO settings for eSPI bus. */ void variant_espi_gpio_table(const struct soc_amd_gpio **gpio, size_t *size); diff --git a/src/mainboard/google/skyrim/variants/baseboard/smihandler.c b/src/mainboard/google/skyrim/variants/baseboard/smihandler.c index 0243747da7..ff59b2b042 100644 --- a/src/mainboard/google/skyrim/variants/baseboard/smihandler.c +++ b/src/mainboard/google/skyrim/variants/baseboard/smihandler.c @@ -11,13 +11,7 @@ void mainboard_smi_sleep(u8 slp_typ) { - size_t num_gpios; - const struct soc_amd_gpio *gpios; - chromeec_smi_sleep(slp_typ, MAINBOARD_EC_S3_WAKE_EVENTS, MAINBOARD_EC_S5_WAKE_EVENTS); - - variant_sleep_gpio_table(&gpios, &num_gpios); - gpio_configure_pads(gpios, num_gpios); } int mainboard_smi_apmc(u8 apmc)