From 9f8c60e6a8021059421a70d9b3a5b73b7c94dd8c Mon Sep 17 00:00:00 2001 From: Sean Rhodes Date: Wed, 2 Oct 2024 16:39:41 +0100 Subject: mb/starlabs/starlite_adl: Configure Wireless GPIOs later The wireless GPIOs don't need to be configured in the bootblock, so set them up in ramstage. Change-Id: Iab399884edde29891e66ffc097cf6f3dff71c351 Signed-off-by: Sean Rhodes Reviewed-on: https://review.coreboot.org/c/coreboot/+/84637 Reviewed-by: Maxim Tested-by: build bot (Jenkins) --- .../starlabs/starlite_adl/variants/mk_v/gpio.c | 38 ++++++++++------------ 1 file changed, 18 insertions(+), 20 deletions(-) (limited to 'src/mainboard') diff --git a/src/mainboard/starlabs/starlite_adl/variants/mk_v/gpio.c b/src/mainboard/starlabs/starlite_adl/variants/mk_v/gpio.c index 2c0a52bc54..ccebd6215b 100644 --- a/src/mainboard/starlabs/starlite_adl/variants/mk_v/gpio.c +++ b/src/mainboard/starlabs/starlite_adl/variants/mk_v/gpio.c @@ -8,26 +8,6 @@ const struct pad_config early_gpio_table[] = { PAD_CFG_NF(GPP_H10, NONE, DEEP, NF2), /* H11: UART0 TXD Debug Connector */ PAD_CFG_NF(GPP_H11, NONE, DEEP, NF2), - - /* F0: CNV BRI Data */ - PAD_CFG_NF(GPP_F0, NONE, DEEP, NF1), - /* F1: CNV BRI Response */ - PAD_CFG_NF(GPP_F1, UP_20K, DEEP, NF1), - /* F2: CNV RGI Data */ - PAD_CFG_NF(GPP_F2, NONE, DEEP, NF1), - /* F3: CNV RGI Response */ - PAD_CFG_NF(GPP_F3, UP_20K, DEEP, NF1), - /* F4: CNV RF Reset */ - PAD_CFG_NF(GPP_F4, NONE, DEEP, NF1), - /* F5: Not used MODEM_CLKREQ */ - PAD_CFG_NF(GPP_F5, NONE, DEEP, NF2), - /* F6: CNV PA Blanking */ - PAD_NC(GPP_F6, NONE), - - /* A13: BlueTooth RF Kill */ - PAD_CFG_GPO(GPP_A13, 1, DEEP), - /* E3: WiFi RF Kill */ - PAD_CFG_GPO(GPP_E3, 1, DEEP), }; const struct pad_config *variant_early_gpio_table(size_t *num) @@ -82,6 +62,8 @@ const struct pad_config gpio_table[] = { PAD_NC(GPP_A11, NONE), /* A12: PCH M.2 SSD PEDET */ PAD_CFG_NF(GPP_A12, NONE, DEEP, NF1), + /* A13: BlueTooth RF Kill */ + PAD_CFG_GPO(GPP_A13, 1, DEEP), /* A14: Camera Power Enable */ PAD_NC(GPP_A14, NONE), /* A15: Camera Reset */ @@ -260,6 +242,8 @@ const struct pad_config gpio_table[] = { PAD_NC(GPP_E1, NONE), /* E2: Not Connected */ PAD_NC(GPP_E2, NONE), + /* E3: WiFi RF Kill */ + PAD_CFG_GPO(GPP_E3, 1, DEEP), /* E4: P Offset */ PAD_NC(GPP_E4, NONE), /* E5: P Out */ @@ -303,6 +287,20 @@ const struct pad_config gpio_table[] = { /* E23: Not Connected */ PAD_NC(GPP_E23, NONE), + /* F0: CNV BRI Data */ + PAD_CFG_NF(GPP_F0, NONE, DEEP, NF1), + /* F1: CNV BRI Response */ + PAD_CFG_NF(GPP_F1, UP_20K, DEEP, NF1), + /* F2: CNV RGI Data */ + PAD_CFG_NF(GPP_F2, NONE, DEEP, NF1), + /* F3: CNV RGI Response */ + PAD_CFG_NF(GPP_F3, UP_20K, DEEP, NF1), + /* F4: CNV RF Reset */ + PAD_CFG_NF(GPP_F4, NONE, DEEP, NF1), + /* F5: Not used MODEM_CLKREQ */ + PAD_CFG_NF(GPP_F5, NONE, DEEP, NF2), + /* F6: CNV PA Blanking */ + PAD_NC(GPP_F6, NONE), /* F7: TBT LSX VCCIO Weak Internal PD 20K Low: 1.8V High: 3.3V */ -- cgit v1.2.3