aboutsummaryrefslogtreecommitdiff
path: root/src/mainboard/google
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard/google')
-rw-r--r--src/mainboard/google/brya/variants/quandiso/fw_config.c16
-rw-r--r--src/mainboard/google/brya/variants/quandiso/gpio.c2
2 files changed, 17 insertions, 1 deletions
diff --git a/src/mainboard/google/brya/variants/quandiso/fw_config.c b/src/mainboard/google/brya/variants/quandiso/fw_config.c
index e9a81a4b89..c5ac0d275e 100644
--- a/src/mainboard/google/brya/variants/quandiso/fw_config.c
+++ b/src/mainboard/google/brya/variants/quandiso/fw_config.c
@@ -57,6 +57,17 @@ static const struct pad_config stylus_disable_pads[] = {
PAD_NC_LOCK(GPP_F15, NONE, LOCK_CONFIG),
};
+static const struct pad_config sd_disable_pads[] = {
+ /* D8 : SD_CLKREQ_ODL */
+ PAD_NC(GPP_D8, NONE),
+ /* D17 : SD_WAKE_N */
+ PAD_NC_LOCK(GPP_D17, NONE, LOCK_CONFIG),
+ /* H12 : SD_PERST_L */
+ PAD_NC_LOCK(GPP_H12, NONE, LOCK_CONFIG),
+ /* H13 : EN_PP3300_SD_X */
+ PAD_NC_LOCK(GPP_H13, NONE, LOCK_CONFIG),
+};
+
static const struct pad_config disable_wifi_pch_susclk[] = {
/* GPD8 ==> NC */
PAD_NC(GPD8, NONE),
@@ -79,6 +90,11 @@ void fw_config_gpio_padbased_override(struct pad_config *padbased_table)
gpio_padbased_override(padbased_table, stylus_disable_pads,
ARRAY_SIZE(stylus_disable_pads));
}
+ if (fw_config_probe(FW_CONFIG(SD_CARD, SD_ABSENT))) {
+ printk(BIOS_INFO, "Disable SD card GPIO pins.\n");
+ gpio_padbased_override(padbased_table, sd_disable_pads,
+ ARRAY_SIZE(sd_disable_pads));
+ }
if (fw_config_probe(FW_CONFIG(WIFI_SAR_ID, SAR_ID_3))) {
printk(BIOS_INFO, "Disable PCH SUSCLK.\n");
gpio_padbased_override(padbased_table, disable_wifi_pch_susclk,
diff --git a/src/mainboard/google/brya/variants/quandiso/gpio.c b/src/mainboard/google/brya/variants/quandiso/gpio.c
index 6f47d383c6..2e2a6f5f62 100644
--- a/src/mainboard/google/brya/variants/quandiso/gpio.c
+++ b/src/mainboard/google/brya/variants/quandiso/gpio.c
@@ -93,7 +93,7 @@ static const struct pad_config romstage_gpio_table[] = {
/* C1 : SMBDATA ==> USI_RST_L */
PAD_CFG_GPO(GPP_C1, 0, DEEP),
/* H12 : UART0_RTS# ==> SD_PERST_L */
- PAD_CFG_GPO(GPP_H12, 0, DEEP),
+ PAD_CFG_GPO(GPP_H12, 1, DEEP),
/* H20 : IMGCLKOUT1 ==> WLAN_PERST_L */
PAD_CFG_GPO(GPP_H20, 1, DEEP),
};