diff options
| author | M Naveen <naveen.m@intel.com> | 2018-03-27 11:41:34 +0530 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2018-04-01 17:41:56 +0000 |
| commit | f0082ac71aaf039e47e6504c8ce2917beefe19b3 (patch) | |
| tree | e62d6c347c2700e94ee0d788822447916c6d3864 /src/mainboard/google | |
| parent | 76d17719fe44faa4aa97fd6c26f121ba279761dd (diff) | |
mb/google/octopus: update SSP port and DMIC 4CH nhlt support
Patch corrects SSP configuration to enable audio on GLK boards.
Octopus variant board uses max98357a speaker codec and 4CH DMIC,
Select the appropriate NHLT blob to be packaged in CBFS.
Change-Id: I101ed80f4421925120116b018424ef19d95a2a3a
Signed-off-by: Naveen Manohar <naveen.m@intel.com>
Reviewed-on: https://review.coreboot.org/25387
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Sathyanarayana Nujella <sathyanarayana.nujella@intel.corp-partner.google.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard/google')
| -rw-r--r-- | src/mainboard/google/octopus/variants/baseboard/nhlt.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mainboard/google/octopus/variants/baseboard/nhlt.c b/src/mainboard/google/octopus/variants/baseboard/nhlt.c index 7439b73fd1..4fc216ed51 100644 --- a/src/mainboard/google/octopus/variants/baseboard/nhlt.c +++ b/src/mainboard/google/octopus/variants/baseboard/nhlt.c @@ -24,14 +24,18 @@ void __attribute__((weak)) variant_nhlt_init(struct nhlt *nhlt) if (!nhlt_soc_add_dmic_array(nhlt, 2)) printk(BIOS_ERR, "Added 2CH DMIC array.\n"); + /* 4 Channel DMIC array. */ + 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_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"); } |