summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/google/brya/variants/nivviks/gpio.c20
1 files changed, 18 insertions, 2 deletions
diff --git a/src/mainboard/google/brya/variants/nivviks/gpio.c b/src/mainboard/google/brya/variants/nivviks/gpio.c
index 6d07a37bfc..f20288fe37 100644
--- a/src/mainboard/google/brya/variants/nivviks/gpio.c
+++ b/src/mainboard/google/brya/variants/nivviks/gpio.c
@@ -8,6 +8,10 @@
/* Pad configuration in ramstage for nivviks board_id = 0 */
static const struct pad_config board_id0_overrides[] = {
+ /* D7 : WLAN_CLKREQ_ODL */
+ PAD_NC(GPP_D7, NONE),
+ /* H3 : WLAN_PCIE_WAKE_ODL */
+ PAD_NC(GPP_H3, NONE),
/* R4 : I2S2_SCLK ==> I2S_SPK_BCLK_R */
PAD_CFG_NF(GPP_R4, NONE, DEEP, NF2),
/* R5 : I2S2_SFRM ==> I2S_SPK_LRCK_R */
@@ -30,18 +34,30 @@ static const struct pad_config board_id0_overrides[] = {
PAD_CFG_NF(GPP_S7, NONE, DEEP, NF2),
};
+/* Pad configuration in ramstage for nivviks board_id >= 1 */
+static const struct pad_config override_gpio_table[] = {
+ /* D7 : WLAN_CLKREQ_ODL */
+ PAD_NC(GPP_D7, NONE),
+ /* H3 : WLAN_PCIE_WAKE_ODL */
+ PAD_NC(GPP_H3, NONE),
+};
+
/* Pad configuration in ramstage for nirwen */
static const struct pad_config override_gpio_table_nirwen[] = {
/* B4 : SSD_PERST_L */
PAD_CFG_GPO(GPP_B4, 1, DEEP),
/* D6 : SRCCLKREQ1# ==> SSD_CLKREQ_ODL */
PAD_CFG_NF(GPP_D6, NONE, DEEP, NF1),
+ /* D7 : WLAN_CLKREQ_ODL */
+ PAD_NC(GPP_D7, NONE),
/* D11 : EN_PP3300_SSD */
PAD_CFG_GPO(GPP_D11, 1, DEEP),
/* E13 : SRCCLKREQ1# ==> WWAN_EN */
PAD_CFG_GPO(GPP_E13, 1, DEEP),
/* E17 : SSD_PLN_L */
PAD_CFG_GPO(GPP_E17, 1, PLTRST),
+ /* H3 : WLAN_PCIE_WAKE_ODL */
+ PAD_NC(GPP_H3, NONE),
};
/* Early pad configuration in bootblock for nivviks */
@@ -116,8 +132,8 @@ const struct pad_config *variant_gpio_override_table(size_t *num)
}
if (id == 1) {
- *num = 0;
- return NULL;
+ *num = ARRAY_SIZE(override_gpio_table);
+ return override_gpio_table;
}
/* board_id >= 2 means nirwen */