mb/google/nissa: Simplify LTE GPIO config using pad-based overrides
Currently, to enable/disable LTE based on fw_config on nissa, we have
two sets of GPIOs: lte_enable_pads and lte_disable_pads. This was to
prevent the SAR interrupt pin GPP_H19 from floating for the short period
of time between enabling it in gpio.c and disabling it in fw_config.c
(see CB:64270 for more details).
With the new pad-based GPIO overrides (CB:64712), this is no longer an
issue since the gpio.c and fw_config.c overrides are applied at the same
time. So simplify the LTE GPIO configuration by enabling all the LTE
pins in the variant gpio.c, then disabling them in fw_config.c if
needed.
BUG=b:231690996
TEST=LTE still works on nivviks
Change-Id: I5bf20a027414ea5e7c1f198d69e355c76f467244
Signed-off-by: Reka Norman <rekanorman@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/66776
Reviewed-by: Kangheui Won <khwon@chromium.org>
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/src/mainboard/google/brya/variants/nivviks/fw_config.c b/src/mainboard/google/brya/variants/nivviks/fw_config.c
index 3362f3d..654d2f4 100644
--- a/src/mainboard/google/brya/variants/nivviks/fw_config.c
+++ b/src/mainboard/google/brya/variants/nivviks/fw_config.c
@@ -3,31 +3,33 @@
#include <baseboard/gpio.h>
#include <baseboard/variants.h>
#include <boardid.h>
-#include <bootstate.h>
#include <console/console.h>
#include <fw_config.h>
-static const struct pad_config lte_enable_pads[] = {
- /* A8 : WWAN_RF_DISABLE_ODL */
- PAD_CFG_GPO(GPP_A8, 1, DEEP),
- /* H19 : SOC_I2C_SUB_INT_ODL */
- PAD_CFG_GPI_APIC(GPP_H19, NONE, PLTRST, LEVEL, NONE),
- /* H23 : WWAN_SAR_DETECT_ODL */
- PAD_CFG_GPO(GPP_H23, 1, DEEP),
-};
-
static const struct pad_config lte_disable_pads_nivviks[] = {
+ /* A8 : WWAN_RF_DISABLE_ODL */
+ PAD_NC(GPP_A8, NONE),
/* D6 : WWAN_EN */
PAD_NC(GPP_D6, NONE),
/* F12 : WWAN_RST_L */
PAD_NC_LOCK(GPP_F12, NONE, LOCK_CONFIG),
+ /* H19 : SOC_I2C_SUB_INT_ODL */
+ PAD_NC(GPP_H19, NONE),
+ /* H23 : WWAN_SAR_DETECT_ODL */
+ PAD_NC(GPP_H23, NONE),
};
static const struct pad_config lte_disable_pads_nirwen[] = {
+ /* A8 : WWAN_RF_DISABLE_ODL */
+ PAD_NC(GPP_A8, NONE),
/* E13 : WWAN_EN */
PAD_NC_LOCK(GPP_E13, NONE, LOCK_CONFIG),
/* F12 : WWAN_RST_L */
PAD_NC_LOCK(GPP_F12, NONE, LOCK_CONFIG),
+ /* H19 : SOC_I2C_SUB_INT_ODL */
+ PAD_NC(GPP_H19, NONE),
+ /* H23 : WWAN_SAR_DETECT_ODL */
+ PAD_NC(GPP_H23, NONE),
};
static const struct pad_config sd_disable_pads[] = {
@@ -94,11 +96,7 @@
void fw_config_gpio_padbased_override(struct pad_config *padbased_table)
{
- if (fw_config_probe(FW_CONFIG(DB_USB, DB_1C_LTE))) {
- printk(BIOS_INFO, "Enable LTE-related GPIO pins.\n");
- gpio_padbased_override(padbased_table, lte_enable_pads,
- ARRAY_SIZE(lte_enable_pads));
- } else {
+ if (!fw_config_probe(FW_CONFIG(DB_USB, DB_1C_LTE))) {
if (board_id() >= 2) {
printk(BIOS_INFO, "Disable LTE-related GPIO pins on nirwen.\n");
gpio_padbased_override(padbased_table, lte_disable_pads_nirwen,