summaryrefslogtreecommitdiff
path: root/src/mainboard/google/dedede
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard/google/dedede')
-rw-r--r--src/mainboard/google/dedede/variants/baseboard/devicetree.cb7
-rw-r--r--src/mainboard/google/dedede/variants/baseboard/gpio.c22
2 files changed, 19 insertions, 10 deletions
diff --git a/src/mainboard/google/dedede/variants/baseboard/devicetree.cb b/src/mainboard/google/dedede/variants/baseboard/devicetree.cb
index 72ce7c1821..a856b222c1 100644
--- a/src/mainboard/google/dedede/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/dedede/variants/baseboard/devicetree.cb
@@ -114,6 +114,11 @@ chip soc/intel/jasperlake
# Enable EMMC HS400 mode
register "ScsEmmcHs400Enabled" = "1"
+ # GPIO for SD card detect
+ register "sdcard_cd_gpio" = "VGPIO_39"
+ # SD card power enable polarity
+ register "SdCardPowerEnableActiveHigh" = "1"
+
# Display related UPDs
# Select eDP for port A
register "DdiPortAConfig" = "1"
@@ -255,7 +260,7 @@ chip soc/intel/jasperlake
register "wake" = "GPE0_PME_B0"
device pci 14.3 on end # CNVi wifi
end
- device pci 14.5 off end # SDCard
+ device pci 14.5 on end # SDCard
device pci 15.0 on end # I2C 0
device pci 15.1 on end # I2C 1
device pci 15.2 on end # I2C 2
diff --git a/src/mainboard/google/dedede/variants/baseboard/gpio.c b/src/mainboard/google/dedede/variants/baseboard/gpio.c
index ca28e3d525..e62140e2d1 100644
--- a/src/mainboard/google/dedede/variants/baseboard/gpio.c
+++ b/src/mainboard/google/dedede/variants/baseboard/gpio.c
@@ -267,26 +267,26 @@ static const struct pad_config gpio_table[] = {
PAD_CFG_NF(GPP_F18, NONE, DEEP, NF1),
/* G0 : SD_CMD */
- PAD_NC(GPP_G0, NONE),
+ PAD_CFG_NF(GPP_G0, NATIVE, DEEP, NF1),
/* G1 : SD_DATA0 */
- PAD_NC(GPP_G1, NONE),
+ PAD_CFG_NF(GPP_G1, NATIVE, DEEP, NF1),
/* G2 : SD_DATA1 */
- PAD_NC(GPP_G2, NONE),
+ PAD_CFG_NF(GPP_G2, NATIVE, DEEP, NF1),
/* G3 : SD_DATA2 */
- PAD_NC(GPP_G3, NONE),
+ PAD_CFG_NF(GPP_G3, NATIVE, DEEP, NF1),
/* G4 : SD_DATA3 */
- PAD_NC(GPP_G4, NONE),
+ PAD_CFG_NF(GPP_G4, NATIVE, DEEP, NF1),
/* G5 : SD_CD_ODL */
- PAD_NC(GPP_G5, NONE),
+ PAD_CFG_NF(GPP_G5, NONE, PLTRST, NF1),
/* G6 : SD_CLK */
- PAD_NC(GPP_G6, NONE),
+ PAD_CFG_NF(GPP_G6, NATIVE, DEEP, NF1),
/* G7 : SD_SDIO_WP */
- PAD_NC(GPP_G7, NONE),
+ PAD_CFG_NF(GPP_G7, DN_20K, DEEP, NF1),
/* H0 : WWAN_PERST */
PAD_NC(GPP_H0, NONE),
/* H1 : EN_PP3300_SD_U */
- PAD_NC(GPP_H1, NONE),
+ PAD_CFG_NF(GPP_H1, NONE, DEEP, NF1),
/* H2 : CNV_CLKREQ0 */
PAD_CFG_NF(GPP_H2, NONE, DEEP, NF3),
/* H3 : GPP_H03/SX_EXIT_HOLDOFF_N */
@@ -382,6 +382,10 @@ static const struct pad_config gpio_table[] = {
PAD_NC(GPD9, NONE),
/* GPD10 : AP_SLP_S5_L */
PAD_NC(GPD10, NONE),
+
+ /* SD card detect virtual GPIO */
+ PAD_CFG_GPI_GPIO_DRIVER(VGPIO_39, NONE, PLTRST),
+
};
/* Early pad configuration in bootblock */