From 9961343e67335c1e01ea57b4229c3acff42cf71a Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Tue, 14 Jul 2020 12:15:59 -0700 Subject: mb/google/zork: Drop power and reset control in romstage for trembyle This change drops power and reset control for non PCIe devices in romstage as this is not required. +---------------------+--------------------------------------------+--------------------+ | GPIO| Net name | External| Internal| Domain| State at reset | State on S3 resume | | # | | Pull | Pull | | | | +---------------------------------------------------------------------------------------+ | 5 | PEN_POWER_EN | 100K PD | PD | S5 | Powered off | Powered on | | | | | | | (because of | (since power is not| | | | | | | internal PD) | disabled when | | | | | | | | entering S3) | +---------------------------------------------------------------------------------------+ | 13 |EN_PWR_TOUCHPAD| 499K PD | PU | S5 | Powered on | Powered on | | |_PS2 | | | | (because of | (since trackpad | | | | | | | internal PU) | is wake source) | +---------------------------------------------------------------------------------------+ | 68 | EMMC_RESET_L | 100K PU | PD | S0 | Asserted | Asserted | | | | | | | (because of | (because of | | | | | | | internal PD) | internal PD) | +---------------------------------------------------------------------------------------+ | 76 | EN_PWR_CAMERA | 499K PD | PD | S0 | Powered off | Powered off | | | | | | | (because of | (because of | | | | | | | internal PD) | internal PD) | +---------------------------------------------------------------------------------------+ | 140 | USI_RESET | 10K PD | PD | S0 | Deasserted | Deasserted | | | | | | | (because of | (because of | | | | | | | internal PD) | internal PD) | +---------------------------------------------------------------------------------------+ +---------------------------------------------------------------------------------------+ | 67 |EN_PWR_TOUCHPAD| 10K PU | PD | S0 | Powered off | Powered off | | |_PS2 (pre-V3) | | | | (because of | (because of | | | | | | | internal PD) | internal PD) | | | | | | | | | +-----+---------------+---------+---------+-------+----------------+--------------------+ GPIO_140 starts deasserted out of reset and S3 resume, but gets asserted in ramstage since it is eventually deasserted by OS using ACPI methods. BUG=b:154351731 Signed-off-by: Furquan Shaikh Change-Id: Ieadc62f1a13857209cf0a62f204efb9278e0e97d Reviewed-on: https://review.coreboot.org/c/coreboot/+/43462 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- .../variants/baseboard/gpio_baseboard_trembyle.c | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'src/mainboard/google') diff --git a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c index fc6ca2026c..106ebd629f 100644 --- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c +++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c @@ -10,47 +10,27 @@ #include static const struct soc_amd_gpio gpio_set_stage_rom_pre_v3[] = { - /* PEN_POWER_EN - reset */ - PAD_GPO(GPIO_5, LOW), /* NVME_AUX_RESET_L */ PAD_GPO(GPIO_40, HIGH), - /* EN_PWR_TOUCHPAD_PS2 - reset */ - PAD_GPO(GPIO_67, LOW), - /* EMMC_RESET - reset (default stuffing unused)*/ - PAD_GPO(GPIO_68, HIGH), - /* EN_PWR_CAMERA - reset */ - PAD_GPO(GPIO_76, LOW), /* CLK_REQ0_L - WIFI */ PAD_NF(GPIO_92, CLK_REQ0_L, PULL_UP), /* CLK_REQ1_L - SD Card */ PAD_NF(GPIO_115, CLK_REQ1_L, PULL_UP), /* CLK_REQ4_L - SSD */ PAD_NF(GPIO_132, CLK_REQ4_L, PULL_UP), - /* USI_RESET - reset */ - PAD_GPO(GPIO_140, HIGH), /* SD_AUX_RESET_L */ PAD_GPO(GPIO_142, HIGH), }; static const struct soc_amd_gpio gpio_set_stage_rom_v3[] = { - /* PEN_POWER_EN - reset */ - PAD_GPO(GPIO_5, LOW), - /* EN_PWR_TOUCHPAD_PS2 - reset */ - PAD_GPO(GPIO_13, LOW), /* NVME_AUX_RESET_L */ PAD_GPO(GPIO_40, HIGH), - /* EMMC_RESET - reset (default stuffing unused)*/ - PAD_GPO(GPIO_68, HIGH), - /* EN_PWR_CAMERA - reset */ - PAD_GPO(GPIO_76, LOW), /* CLK_REQ0_L - WIFI */ PAD_NF(GPIO_92, CLK_REQ0_L, PULL_UP), /* CLK_REQ1_L - SD Card */ PAD_NF(GPIO_115, CLK_REQ1_L, PULL_UP), /* CLK_REQ4_L - SSD */ PAD_NF(GPIO_132, CLK_REQ4_L, PULL_UP), - /* USI_RESET - reset */ - PAD_GPO(GPIO_140, HIGH), /* SD_AUX_RESET_L */ PAD_GPO(GPIO_142, HIGH), }; -- cgit v1.2.3