From c699255ba50ffa3e79dbacb572901e07034662be Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Thu, 18 Jun 2020 01:10:25 -0700 Subject: [PATCH] mb/google/zork: Update _v3 romstage and wifi GPIO tables for dalboz This change updates _v3 version of romstage and wifi GPIO tables to match v3 schematics. BUG=b:157165628, b:157744136, b:157743835 TEST=Compiles Signed-off-by: Martin Roth Signed-off-by: Furquan Shaikh Change-Id: Id8b46fcb4552af6eda5b50224b0557bae37f9ebd Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/coreboot/+/2251392 Reviewed-by: Aaron Durbin Commit-Queue: Furquan Shaikh Tested-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/c/coreboot/+/42723 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- .../zork/variants/baseboard/gpio_baseboard_dalboz.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c index c2bac09081..3f72015c21 100644 --- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c +++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c @@ -52,6 +52,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_6, LOW), /* EC_FCH_WAKE_L */ PAD_GPI(GPIO_24, PULL_UP), PAD_WAKE(GPIO_24, PULL_UP, EDGE_LOW, S3_S4_S5), @@ -60,12 +62,10 @@ static const struct soc_amd_gpio gpio_set_stage_rom_v3[] = { PAD_NF(GPIO_26, PCIE_RST_L, PULL_NONE), /* PCIE_RST1_L - Variable timings (May remove) */ PAD_NF(GPIO_27, PCIE_RST1_L, PULL_NONE), + /* WIFI_AUX_RESET */ + PAD_GPO(GPIO_29, LOW), /* 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 */ @@ -88,7 +88,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[] = {