diff options
author | Paul Huang <paul2_huang@pegatron.corp-partner.google.com> | 2021-12-03 10:17:15 +0800 |
---|---|---|
committer | Felix Held <felix-coreboot@felixheld.de> | 2021-12-13 14:01:47 +0000 |
commit | 0f0edeed2e15861dd23319b50c3fea091c02734e (patch) | |
tree | 77bdc3c87e4db2bc446466df391759787a97af3c /src/mainboard/google/octopus/variants | |
parent | c71e320bae0446afc593c88ffc9a9d95053770bf (diff) |
mb/google/octopus: add ALC5682I-VS to be supported in the SSFC
Add ALC5682I-VS codec support. ALC5682I-VD/ALC5682I-VS load different
hid name depending on SSFC.
BUG=b:198722640
BRANCH=octopus
TEST=Set CBI SSFC BIT9-11 to select codec, and test audio works
Change-Id: I80be12d88e100ce8586371fc49b36447859e24f8
Signed-off-by: Paul Huang <paul2_huang@pegatron.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/59856
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marco Chen <marcochen@google.com>
Diffstat (limited to 'src/mainboard/google/octopus/variants')
-rw-r--r-- | src/mainboard/google/octopus/variants/baseboard/include/baseboard/cbi_ssfc.h | 1 | ||||
-rw-r--r-- | src/mainboard/google/octopus/variants/baseboard/nhlt.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/mainboard/google/octopus/variants/baseboard/include/baseboard/cbi_ssfc.h b/src/mainboard/google/octopus/variants/baseboard/include/baseboard/cbi_ssfc.h index cef047aa5d..cd160bad88 100644 --- a/src/mainboard/google/octopus/variants/baseboard/include/baseboard/cbi_ssfc.h +++ b/src/mainboard/google/octopus/variants/baseboard/include/baseboard/cbi_ssfc.h @@ -30,6 +30,7 @@ enum ssfc_audio_codec { SSFC_AUDIO_CODEC_DA7219, SSFC_AUDIO_CODEC_RT5682, SSFC_AUDIO_CODEC_CS42L42, + SSFC_AUDIO_CODEC_RT5682_VS, }; #define SSFC_AUDIO_CODEC_OFFSET 9 #define SSFC_AUDIO_CODEC_MASK 0x7 diff --git a/src/mainboard/google/octopus/variants/baseboard/nhlt.c b/src/mainboard/google/octopus/variants/baseboard/nhlt.c index 9c9316c67a..13a40b35dd 100644 --- a/src/mainboard/google/octopus/variants/baseboard/nhlt.c +++ b/src/mainboard/google/octopus/variants/baseboard/nhlt.c @@ -28,7 +28,9 @@ void __weak variant_nhlt_init(struct nhlt *nhlt) printk(BIOS_ERR, "Added Dialog_7219 codec.\n"); } - if (CONFIG(NHLT_RT5682) && codec == SSFC_AUDIO_CODEC_RT5682) { + if (CONFIG(NHLT_RT5682) && + (codec == SSFC_AUDIO_CODEC_RT5682 || + codec == SSFC_AUDIO_CODEC_RT5682_VS)) { /* Realtek for Headset codec */ if (!nhlt_soc_add_rt5682(nhlt, AUDIO_LINK_SSP2)) printk(BIOS_ERR, "Added ALC5682 codec.\n"); |