summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWisley Chen <wisley.chen@quantatw.com>2020-11-06 17:16:59 +0800
committerTim Wawrzynczak <twawrzynczak@chromium.org>2020-11-18 21:55:00 +0000
commit35010ef9c5a69610eb4698716370d48dc6242a75 (patch)
treedb39e00980555535dc6ff91a91e79c322b2e6a92
parenta04072c91743eed03574c6b3e42bdf450b136009 (diff)
mb/google/volteer: Add new Audio option to FW_CONFIG
Volteer has a new Audio option in FW_CONFIG. This patch adds support for it and when enabled, programs GPIO pins for I2S functionality. BUG=b:171174991 TEST=emerge-volteer coreboot Change-Id: I85bc37980957a3fb6c795858a4e4f44f3e3cc332 Signed-off-by: Wisley Chen <wisley.chen@quantatw.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/47291 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
-rw-r--r--src/mainboard/google/volteer/fw_config.c3
-rw-r--r--src/mainboard/google/volteer/variants/baseboard/devicetree.cb1
2 files changed, 3 insertions, 1 deletions
diff --git a/src/mainboard/google/volteer/fw_config.c b/src/mainboard/google/volteer/fw_config.c
index 0538e7403e..4067fa526a 100644
--- a/src/mainboard/google/volteer/fw_config.c
+++ b/src/mainboard/google/volteer/fw_config.c
@@ -81,7 +81,8 @@ static void fw_config_handle(void *unused)
gpio_configure_pads(i2s_disable_pads, ARRAY_SIZE(i2s_disable_pads));
}
if (fw_config_probe(FW_CONFIG(AUDIO, MAX98357_ALC5682I_I2S)) ||
- fw_config_probe(FW_CONFIG(AUDIO, MAX98373_ALC5682I_I2S))) {
+ fw_config_probe(FW_CONFIG(AUDIO, MAX98373_ALC5682I_I2S)) ||
+ fw_config_probe(FW_CONFIG(AUDIO, MAX98360_ALC5682I_I2S))) {
printk(BIOS_INFO, "Configure GPIOs for I2S audio on UP3.\n");
gpio_configure_pads(i2s_up3_enable_pads, ARRAY_SIZE(i2s_up3_enable_pads));
gpio_configure_pads(dmic_enable_pads, ARRAY_SIZE(dmic_enable_pads));
diff --git a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
index 20a3843439..50be7367da 100644
--- a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
@@ -15,6 +15,7 @@ fw_config
option MAX98373_ALC5682I_I2S 2
option MAX98373_ALC5682_SNDW 3
option MAX98373_ALC5682I_I2S_UP4 4
+ option MAX98360_ALC5682I_I2S 5
end
field TABLETMODE 11
option TABLETMODE_DISABLED 0