diff options
| author | Reka Norman <rekanorman@google.com> | 2022-06-27 15:25:55 +1000 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2022-06-30 14:00:12 +0000 |
| commit | 0214a36987045867a17d8b9aee1dd4b098a7c709 (patch) | |
| tree | 22f14e53d545f1ed51f2c604e5c4e8248bc6a0a3 | |
| parent | 5902d88264353436c33580d9a9ae82247dbb52ab (diff) | |
mb/google/nissa: Remove WLAN power sequencing workaround
CB:63368 added a workaround of driving EN_PP3300_WLAN_X low in bootblock
to prevent a kernel crash on warm reboot. The crash has been fixed in
the kernel, so remove the workaround.
Kernel fix:
https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3463465/
BUG=b:225261075
TEST=Wifi works on nereid, warm reboot doesn't crash the kernel
Change-Id: Idb5547e65ea934954326fcc740b14a83c939432e
Signed-off-by: Reka Norman <rekanorman@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/65449
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kangheui Won <khwon@chromium.org>
Reviewed-by: Frank Wu <frank_wu@compal.corp-partner.google.com>
| -rw-r--r-- | src/mainboard/google/brya/variants/nereid/gpio.c | 8 | ||||
| -rw-r--r-- | src/mainboard/google/brya/variants/xivu/gpio.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/mainboard/google/brya/variants/nereid/gpio.c b/src/mainboard/google/brya/variants/nereid/gpio.c index b472fe7de4..6b2cb7a1f4 100644 --- a/src/mainboard/google/brya/variants/nereid/gpio.c +++ b/src/mainboard/google/brya/variants/nereid/gpio.c @@ -30,8 +30,6 @@ static const struct pad_config override_gpio_table[] = { /* Early pad configuration in bootblock */ static const struct pad_config early_gpio_table[] = { - /* B11 : PMCALERT# ==> EN_PP3300_WLAN_X */ - PAD_CFG_GPO(GPP_B11, 0, DEEP), /* H12 : UART0_RTS# ==> SD_PERST_L */ PAD_CFG_GPO(GPP_H12, 0, DEEP), /* H20 : IMGCLKOUT1 ==> WLAN_PERST_L */ @@ -50,15 +48,17 @@ static const struct pad_config early_gpio_table[] = { PAD_CFG_NF(GPP_H10, NONE, DEEP, NF2), /* H11 : UART0_TXD ==> UART_SOC_TX_DBG_RX */ PAD_CFG_NF(GPP_H11, NONE, DEEP, NF2), + /* B11 : PMCALERT# ==> EN_PP3300_WLAN_X */ + PAD_CFG_GPO(GPP_B11, 1, DEEP), /* H13 : UART0_CTS# ==> EN_PP3300_SD_X */ PAD_CFG_GPO(GPP_H13, 1, DEEP), }; static const struct pad_config romstage_gpio_table[] = { - /* B11 : PMCALERT# ==> EN_PP3300_WLAN_X */ - PAD_CFG_GPO(GPP_B11, 1, DEEP), /* H12 : UART0_RTS# ==> SD_PERST_L */ PAD_CFG_GPO(GPP_H12, 1, DEEP), + /* H20 : IMGCLKOUT1 ==> WLAN_PERST_L */ + PAD_CFG_GPO(GPP_H20, 1, DEEP), }; const struct pad_config *variant_gpio_override_table(size_t *num) diff --git a/src/mainboard/google/brya/variants/xivu/gpio.c b/src/mainboard/google/brya/variants/xivu/gpio.c index d154af8fdb..72526e41a1 100644 --- a/src/mainboard/google/brya/variants/xivu/gpio.c +++ b/src/mainboard/google/brya/variants/xivu/gpio.c @@ -17,8 +17,6 @@ static const struct pad_config override_gpio_table[] = { /* Early pad configuration in bootblock */ static const struct pad_config early_gpio_table[] = { - /* B11 : PMCALERT# ==> EN_PP3300_WLAN_X */ - PAD_CFG_GPO(GPP_B11, 0, DEEP), /* H12 : UART0_RTS# ==> SD_PERST_L */ PAD_CFG_GPO(GPP_H12, 0, DEEP), /* H20 : IMGCLKOUT1 ==> WLAN_PERST_L */ @@ -37,15 +35,17 @@ static const struct pad_config early_gpio_table[] = { PAD_CFG_NF(GPP_H10, NONE, DEEP, NF2), /* H11 : UART0_TXD ==> UART_SOC_TX_DBG_RX */ PAD_CFG_NF(GPP_H11, NONE, DEEP, NF2), + /* B11 : PMCALERT# ==> EN_PP3300_WLAN_X */ + PAD_CFG_GPO(GPP_B11, 1, DEEP), /* H13 : UART0_CTS# ==> EN_PP3300_SD_X */ PAD_CFG_GPO(GPP_H13, 1, DEEP), }; static const struct pad_config romstage_gpio_table[] = { - /* B11 : PMCALERT# ==> EN_PP3300_WLAN_X */ - PAD_CFG_GPO(GPP_B11, 1, DEEP), /* H12 : UART0_RTS# ==> SD_PERST_L */ PAD_CFG_GPO(GPP_H12, 1, DEEP), + /* H20 : IMGCLKOUT1 ==> WLAN_PERST_L */ + PAD_CFG_GPO(GPP_H20, 1, DEEP), }; const struct pad_config *variant_gpio_override_table(size_t *num) |