From 8ae77f62cc46232459effd4c835d71959791396e Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Thu, 18 Jun 2020 01:06:04 -0700 Subject: mb/google/zork: Update _v3 romstage and wifi GPIO tables for trembyle This change updates _v3 version of romstage and wifi GPIO tables to match v3 schematics. BUG=b:157088093, b:154676993, b:157098434 TEST=Compiles Signed-off-by: Martin Roth Signed-off-by: Furquan Shaikh Change-Id: Ic605559b3226e2ad9b5b3f3fa45c4aa9f9b5fe22 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/coreboot/+/2251391 Reviewed-by: Aaron Durbin Commit-Queue: Furquan Shaikh Tested-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/c/coreboot/+/42722 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- .../google/zork/variants/baseboard/gpio_baseboard_trembyle.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 2c87a0f21f..fad8a53d3e 100644 --- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c +++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c @@ -50,6 +50,8 @@ static const struct soc_amd_gpio gpio_set_wifi_pre_v3[] = { 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), /* EC_FCH_WAKE_L */ PAD_GPI(GPIO_24, PULL_UP), PAD_WAKE(GPIO_24, PULL_UP, EDGE_LOW, S3_S4_S5), @@ -60,14 +62,12 @@ static const struct soc_amd_gpio gpio_set_stage_rom_v3[] = { PAD_NF(GPIO_27, PCIE_RST1_L, PULL_NONE), /* NVME_AUX_RESET_L */ PAD_GPO(GPIO_40, HIGH), - /* WIFI_AUX_RESET_L */ - PAD_GPO(GPIO_42, 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), + /* WIFI_AUX_RESET_L */ + PAD_GPO(GPIO_86, HIGH), /* CLK_REQ0_L - WIFI */ PAD_NF(GPIO_92, CLK_REQ0_L, PULL_UP), /* CLK_REQ1_L - SD Card */ @@ -84,7 +84,7 @@ static const struct soc_amd_gpio gpio_set_stage_rom_v3[] = { static const struct soc_amd_gpio gpio_set_wifi_v3[] = { /* EN_PWR_WIFI */ - PAD_GPO(GPIO_29, HIGH), + PAD_GPO(GPIO_42, HIGH), }; static const struct soc_amd_gpio gpio_set_stage_ram[] = { -- cgit v1.2.3