From e098c8a59346df4c7a17ec7aec04bcf4e3bf1f61 Mon Sep 17 00:00:00 2001 From: Naveen Manohar Date: Thu, 10 May 2018 08:54:14 +0530 Subject: mb/google/octopus: Enable RT5682 headset codec for BIP board Patch adds required changes for RT5682 codec enablement for the BIP board. And code clean-up nhlt blob selection method in config. BUG=b:77892150 TEST=build and boot on a BIP PO board. verify headset codec i2cdetects at address 1a. Change-Id: Iee91518c03a0e9e6ed52bc54a60fc607730a0b7d Signed-off-by: Naveen Manohar Reviewed-on: https://review.coreboot.org/26211 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin Reviewed-by: Furquan Shaikh --- src/mainboard/google/octopus/variants/baseboard/nhlt.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'src/mainboard/google/octopus/variants/baseboard/nhlt.c') diff --git a/src/mainboard/google/octopus/variants/baseboard/nhlt.c b/src/mainboard/google/octopus/variants/baseboard/nhlt.c index 94403a8c35..b71aadf9d0 100644 --- a/src/mainboard/google/octopus/variants/baseboard/nhlt.c +++ b/src/mainboard/google/octopus/variants/baseboard/nhlt.c @@ -29,12 +29,21 @@ void __weak variant_nhlt_init(struct nhlt *nhlt) if (!nhlt_soc_add_dmic_array(nhlt, 4)) printk(BIOS_ERR, "Added 4CH DMIC arrays.\n"); - /* Dialog for Headset codec. + /* * Headset codec is bi-directional but uses the same configuration * settings for render and capture endpoints. */ - if (!nhlt_soc_add_da7219(nhlt, AUDIO_LINK_SSP2)) - printk(BIOS_ERR, "Added Dialog_7219 codec.\n"); + if (IS_ENABLED(CONFIG_NHLT_DA7219)) { + /* Dialog for Headset codec */ + if (!nhlt_soc_add_da7219(nhlt, AUDIO_LINK_SSP2)) + printk(BIOS_ERR, "Added Dialog_7219 codec.\n"); + } + + if (IS_ENABLED(CONFIG_NHLT_RT5682)) { + /* Realtek for Headset codec */ + if (!nhlt_soc_add_rt5682(nhlt, AUDIO_LINK_SSP2)) + printk(BIOS_ERR, "Added ALC5682 codec.\n"); + } /* MAXIM Smart Amps for left and right speakers. */ if (!nhlt_soc_add_max98357(nhlt, AUDIO_LINK_SSP1)) -- cgit v1.2.3