summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Peng <joey.peng@lcfc.corp-partner.google.com>2021-12-30 16:14:25 +0800
committerFelix Held <felix-coreboot@felixheld.de>2022-01-07 20:01:40 +0000
commitaf69af996e57b3d4bd3e588e0379b0a5361a8773 (patch)
tree9b957739de01eb98f39d68fd2b3ef3249ccb7ce3
parentb6a15a72276c0110ad8828c91849ff9864ae115e (diff)
mb/google/brya/var/taniks: Change probe for audio 4 channel speaker
Taniks only uses 4 channel speakers. Change the probe name to match SOF topology settings. BUG=b:207808510 TEST=dmidecode -t 11 shows correct audio fw_config. Signed-off-by: Joey Peng <joey.peng@lcfc.corp-partner.google.com> Change-Id: I2986bd212cef47f70dfeedc642a8db3314c947f6 Reviewed-on: https://review.coreboot.org/c/coreboot/+/60532 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
-rw-r--r--src/mainboard/google/brya/variants/taniks/fw_config.c4
-rw-r--r--src/mainboard/google/brya/variants/taniks/overridetree.cb6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mainboard/google/brya/variants/taniks/fw_config.c b/src/mainboard/google/brya/variants/taniks/fw_config.c
index 8a7c6b45fd..f79110391c 100644
--- a/src/mainboard/google/brya/variants/taniks/fw_config.c
+++ b/src/mainboard/google/brya/variants/taniks/fw_config.c
@@ -47,8 +47,8 @@ static void fw_config_handle(void *unused)
return;
}
- if (fw_config_probe(FW_CONFIG(AUDIO, AUDIO_MAX98357_ALC5682I_I2S))) {
- printk(BIOS_INFO, "Configure audio over I2S with MAX98357 ALC5682I.\n");
+ if (fw_config_probe(FW_CONFIG(AUDIO, AUDIO_MAX98357_ALC5682I_I2S_2WAY))) {
+ printk(BIOS_INFO, "Configure audio over I2S with MAX98357 ALC5682I with 4 speakers.\n");
gpio_configure_pads(dmic_enable_pads, ARRAY_SIZE(dmic_enable_pads));
gpio_configure_pads(i2s_enable_pads, ARRAY_SIZE(i2s_enable_pads));
}
diff --git a/src/mainboard/google/brya/variants/taniks/overridetree.cb b/src/mainboard/google/brya/variants/taniks/overridetree.cb
index cb8c99a0c7..eb1680e0dc 100644
--- a/src/mainboard/google/brya/variants/taniks/overridetree.cb
+++ b/src/mainboard/google/brya/variants/taniks/overridetree.cb
@@ -15,7 +15,7 @@ fw_config
end
field AUDIO 5 7
option AUDIO_UNKNOWN 0
- option AUDIO_MAX98357_ALC5682I_I2S 1
+ option AUDIO_MAX98357_ALC5682I_I2S_2WAY 1
end
field KB_LAYOUT 8 9
option KB_LAYOUT_DEFAULT 0
@@ -248,7 +248,7 @@ chip soc/intel/alderlake
register "property_list[0].name" = ""realtek,jd-src""
register "property_list[0].integer" = "1"
device i2c 1a on
- probe AUDIO AUDIO_MAX98357_ALC5682I_I2S
+ probe AUDIO AUDIO_MAX98357_ALC5682I_I2S_2WAY
end
end
end
@@ -324,7 +324,7 @@ chip soc/intel/alderlake
"ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A11)"
register "sdmode_delay" = "5"
device generic 0 on
- probe AUDIO AUDIO_MAX98357_ALC5682I_I2S
+ probe AUDIO AUDIO_MAX98357_ALC5682I_I2S_2WAY
end
end
end