GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/google/volteer: Add additional SD cards to device list 

The initial commit only focused on GL9755S and RTS5261, but there
were recently other cards added to the fw_config and those also
need to be added to the probe lists.

BUG=b:173207454
TEST=abuild google/volteer

Change-Id: Ic27074a016ffbd4c4dd86104a6d85437357c4b82
Signed-off-by: Duncan Laurie <dlaurie@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48159
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Sukumar Ghorai <sukumar.ghorai@intel.com>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
This commit is contained in:
Duncan Laurie 2020-11-30 10:09:42 -08:00 committed by Duncan Laurie
parent 3cc3d818e8
commit 912d9ec158
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mainboard/google/volteer/fw_config.c
View File

@ -66,7 +66,7 @@ static const struct pad_config i2s_disable_pads[] = {
PAD_NC(GPP_R7, NONE), PAD_NC(GPP_R7, NONE),
}; };
static const struct pad_config sd_gl9755s_pads[] = { static const struct pad_config sd_power_enable_pads[] = {
PAD_CFG_GPO(GPP_D16, 1, DEEP), PAD_CFG_GPO(GPP_D16, 1, DEEP),
}; };
@ -99,9 +99,12 @@ static void fw_config_handle(void *unused)
gpio_configure_pads(dmic_enable_pads, ARRAY_SIZE(dmic_enable_pads)); gpio_configure_pads(dmic_enable_pads, ARRAY_SIZE(dmic_enable_pads));
gpio_configure_pads(sndw_disable_pads, ARRAY_SIZE(sndw_disable_pads)); gpio_configure_pads(sndw_disable_pads, ARRAY_SIZE(sndw_disable_pads));
} }
if (fw_config_probe(FW_CONFIG(DB_SD, SD_GL9755S))) { if (fw_config_probe(FW_CONFIG(DB_SD, SD_GL9755S)) ||
printk(BIOS_INFO, "Configure GPIOs for SD GL9755S.\n"); fw_config_probe(FW_CONFIG(DB_SD, SD_RTS5227S)) ||
gpio_configure_pads(sd_gl9755s_pads, ARRAY_SIZE(sd_gl9755s_pads)); fw_config_probe(FW_CONFIG(DB_SD, SD_GL9750)) ||
fw_config_probe(FW_CONFIG(DB_SD, SD_OZ711LV2LN))) {
printk(BIOS_INFO, "Configure GPIOs for SD power enable.\n");
gpio_configure_pads(sd_power_enable_pads, ARRAY_SIZE(sd_power_enable_pads));
} }
} }
BOOT_STATE_INIT_ENTRY(BS_DEV_ENABLE, BS_ON_ENTRY, fw_config_handle, NULL); BOOT_STATE_INIT_ENTRY(BS_DEV_ENABLE, BS_ON_ENTRY, fw_config_handle, NULL);

8
src/mainboard/google/volteer/variants/baseboard/devicetree.cb
View File

@ -39,7 +39,7 @@ fw_config
option SD_GL9755S 1 option SD_GL9755S 1
option SD_RTS5261 2 option SD_RTS5261 2
option SD_RTS5227S 3 option SD_RTS5227S 3
option SD_L9750 4 option SD_GL9750 4
option SD_OZ711LV2LN 5 option SD_OZ711LV2LN 5
end end
field KB_LAYOUT 20 21 field KB_LAYOUT 20 21
@ -459,12 +459,18 @@ chip soc/intel/tigerlake
device ref pcie_rp8 on device ref pcie_rp8 on
probe DB_SD SD_GL9755S probe DB_SD SD_GL9755S
probe DB_SD SD_RTS5261 probe DB_SD SD_RTS5261
probe DB_SD SD_RTS5227S
probe DB_SD SD_GL9750
probe DB_SD SD_OZ711LV2LN
chip soc/intel/common/block/pcie/rtd3 chip soc/intel/common/block/pcie/rtd3
register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D16)" register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D16)"
register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_H3)" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_H3)"
register "srcclk_pin" = "3" register "srcclk_pin" = "3"
device generic 0 on device generic 0 on
probe DB_SD SD_GL9755S probe DB_SD SD_GL9755S
probe DB_SD SD_RTS5227S
probe DB_SD SD_GL9750
probe DB_SD SD_OZ711LV2LN
end end
end end
chip soc/intel/common/block/pcie/rtd3 chip soc/intel/common/block/pcie/rtd3