diff options
| author | Hannah Williams <hannah.williams@intel.com> | 2017-06-20 14:31:44 -0700 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2017-09-16 22:30:33 +0000 |
| commit | 7427abce07fb80289646b7653242022182b9e8f9 (patch) | |
| tree | 40856f22b35c5577df5bb625590472db468c0b2a /src/mainboard/intel/glkrvp/variants/baseboard/nhlt.c | |
| parent | 1d4d3f3f73ded523b271c3b211deff949589751e (diff) | |
mainboard/intel/glkrvp: Add support for audio
This patch adds the below:
1) Add correct SSP endpoint config for spk and headset
2) Update GPIO config for jack detection
3) Update GPIO config for I2S pins
TEST=sound card binds
TEST=cross checked SSDT entries from
/sys/firmware/acpi/tables/
TEST=Jack interrupt works
Change-Id: I32022ddacd79917730080889c040f842e0c9e6b9
Signed-off-by: Hannah Williams <hannah.williams@intel.com>
Signed-off-by: Sathyanarayana Nujella <sathyanarayana.nujella@intel.com>
Reviewed-on: https://review.coreboot.org/19799
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/mainboard/intel/glkrvp/variants/baseboard/nhlt.c')
| -rw-r--r-- | src/mainboard/intel/glkrvp/variants/baseboard/nhlt.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/mainboard/intel/glkrvp/variants/baseboard/nhlt.c b/src/mainboard/intel/glkrvp/variants/baseboard/nhlt.c index ad7048b49b..45cbc8f8c2 100644 --- a/src/mainboard/intel/glkrvp/variants/baseboard/nhlt.c +++ b/src/mainboard/intel/glkrvp/variants/baseboard/nhlt.c @@ -20,18 +20,27 @@ void __attribute__((weak)) variant_nhlt_init(struct nhlt *nhlt) { - /* 2 Channel DMIC array. */ - if (!nhlt_soc_add_dmic_array(nhlt, 2)) + /* 1-dmic configuration */ + if (IS_ENABLED(CONFIG_NHLT_DMIC_1CH_16B) && + !nhlt_soc_add_dmic_array(nhlt, 1)) + printk(BIOS_ERR, "Added 1CH DMIC array.\n"); + /* 2-dmic configuration */ + if (IS_ENABLED(CONFIG_NHLT_DMIC_2CH_16B) && + !nhlt_soc_add_dmic_array(nhlt, 2)) printk(BIOS_ERR, "Added 2CH DMIC array.\n"); + /* 4-dmic configuration */ + if (IS_ENABLED(CONFIG_NHLT_DMIC_4CH_16B) && + !nhlt_soc_add_dmic_array(nhlt, 4)) + printk(BIOS_ERR, "Added 4CH DMIC array.\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_SSP1)) + if (!nhlt_soc_add_da7219(nhlt, AUDIO_LINK_SSP2)) printk(BIOS_ERR, "Added Dialog_7219 codec.\n"); /* MAXIM Smart Amps for left and right speakers. */ - if (!nhlt_soc_add_max98357(nhlt, AUDIO_LINK_SSP5)) + if (!nhlt_soc_add_max98357(nhlt, AUDIO_LINK_SSP1)) printk(BIOS_ERR, "Added Maxim_98357 codec.\n"); } |