diff options
| author | Mark Hsieh <mark_hsieh@wistron.corp-partner.google.com> | 2021-09-09 22:07:41 +0800 |
|---|---|---|
| committer | Tim Wawrzynczak <twawrzynczak@chromium.org> | 2021-09-15 20:50:28 +0000 |
| commit | 28d15507f480e82e1bca4772f90e242c572dd48c (patch) | |
| tree | 26b09625ededf21869a8219941c05657efdc3542 | |
| parent | 535ec536ea288cfbbdaf0801be4215cdf0dd142f (diff) | |
mb/google/brya/variants/gimble: update fw_config for next build phase
Update audio FW config based on the schematic carbine_adl-p_evt_20210901.pdf
BUG=b:199180746
TEST=USE="project_gimble emerge-brya coreboot" and verify it builds
without error.
Signed-off-by: Mark Hsieh <mark_hsieh@wistron.corp-partner.google.com>
Change-Id: I4f8ee1a97dd92c7aa0131cd0a77b05f851a26b05
Reviewed-on: https://review.coreboot.org/c/coreboot/+/57529
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | src/mainboard/google/brya/variants/gimble/fw_config.c | 6 | ||||
| -rw-r--r-- | src/mainboard/google/brya/variants/gimble/overridetree.cb | 22 |
2 files changed, 16 insertions, 12 deletions
diff --git a/src/mainboard/google/brya/variants/gimble/fw_config.c b/src/mainboard/google/brya/variants/gimble/fw_config.c index 92ed0d7bdd..e9d87b33d8 100644 --- a/src/mainboard/google/brya/variants/gimble/fw_config.c +++ b/src/mainboard/google/brya/variants/gimble/fw_config.c @@ -77,6 +77,12 @@ static void fw_config_handle(void *unused) printk(BIOS_INFO, "Configure audio over I2S with MAX98390 ALC5682I.\n"); gpio_configure_pads(dmic_enable_pads, ARRAY_SIZE(dmic_enable_pads)); gpio_configure_pads(i2s_enable_pads, ARRAY_SIZE(i2s_enable_pads)); + } + + if (fw_config_probe(FW_CONFIG(AUDIO, MAX98390_ALC5682I_I2S_SSP1))) { + printk(BIOS_INFO, "Configure audio over I2S with MAX98390 ALC5682I.\n"); + gpio_configure_pads(dmic_enable_pads, ARRAY_SIZE(dmic_enable_pads)); + gpio_configure_pads(i2s_enable_pads, ARRAY_SIZE(i2s_enable_pads)); gpio_configure_pads(bt_i2s_enable_pads, ARRAY_SIZE(bt_i2s_enable_pads)); } } diff --git a/src/mainboard/google/brya/variants/gimble/overridetree.cb b/src/mainboard/google/brya/variants/gimble/overridetree.cb index bb0a7ff269..080546280c 100644 --- a/src/mainboard/google/brya/variants/gimble/overridetree.cb +++ b/src/mainboard/google/brya/variants/gimble/overridetree.cb @@ -1,22 +1,23 @@ fw_config field DB_USB 0 3 - option USB_ABSENT 0 - option USB3_PS8815 1 + option USB_ABSENT 0 + option USB3_PS8815 1 end field DB_SD 4 5 - option SD_ABSENT 0 - option SD_GL9750H 1 + option SD_ABSENT 0 + option SD_GL9750H 1 end field KB_BL 7 7 - option KB_BL_ABSENT 0 - option KB_BL_PRESENT 1 + option KB_BL_ABSENT 0 + option KB_BL_PRESENT 1 end field AUDIO 8 10 - option AUDIO_UNKNOWN 0 - option MAX98390_ALC5682I_I2S 1 + option AUDIO_UNKNOWN 0 + option MAX98390_ALC5682I_I2S 1 + option MAX98390_ALC5682I_I2S_SSP1 2 end field DB_LTE 11 12 - option LTE_ABSENT 0 + option LTE_ABSENT 0 end end chip soc/intel/alderlake @@ -100,7 +101,6 @@ chip soc/intel/alderlake register "property_list[0].name" = ""realtek,jd-src"" register "property_list[0].integer" = "1" device i2c 1a on - probe AUDIO MAX98390_ALC5682I_I2S end end chip drivers/i2c/max98390 @@ -110,7 +110,6 @@ chip soc/intel/alderlake register "r0_calib_key" = ""dsm_calib_r0_0"" register "temperature_calib_key" = ""dsm_calib_temp_0"" device i2c 0x38 on - probe AUDIO MAX98390_ALC5682I_I2S end end chip drivers/i2c/max98390 @@ -120,7 +119,6 @@ chip soc/intel/alderlake register "r0_calib_key" = ""dsm_calib_r0_1"" register "temperature_calib_key" = ""dsm_calib_temp_1"" device i2c 0x3c on - probe AUDIO MAX98390_ALC5682I_I2S end end end #I2C0 |