diff options
| author | Matt DeVillier <matt.devillier@gmail.com> | 2022-12-06 21:05:16 -0600 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2022-12-21 14:00:13 +0000 |
| commit | bf3c648fa7f6cdd946698a2ec6584102b53e4c4a (patch) | |
| tree | 5628cdf3a39071e5cf87c05dcf7bd329766bacc4 /src/mainboard/google | |
| parent | ca342e108227859112746bb262bb742e800b6973 (diff) | |
| download | coreboot-bf3c648fa7f6cdd946698a2ec6584102b53e4c4a.tar.gz coreboot-bf3c648fa7f6cdd946698a2ec6584102b53e4c4a.tar.bz2 coreboot-bf3c648fa7f6cdd946698a2ec6584102b53e4c4a.zip | |
soc/intel/skl; mb/google/eve,poppy: Update NHLT methods
Adapted from WIP (and now abandoned) patches CB:25334, 26308, 26309.
Update the nhlt_soc_add_*() methods for max98373, max98927, and rt5514
codecs to program the render and feedback slot numbers as appropriate.
TEST=boot Windows on google/eve, atlas, nocturne, and rammus. Verify
audio functional with both Google project campfire drivers as well as
coolstar's AVS audio drivers.
Change-Id: Ib8c6e24ba539e205bd5bbd856ecff43b2c016c2e
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70394
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: CoolStar <coolstarorganization@gmail.com>
Diffstat (limited to 'src/mainboard/google')
| -rw-r--r-- | src/mainboard/google/eve/mainboard.c | 5 | ||||
| -rw-r--r-- | src/mainboard/google/poppy/variants/atlas/nhlt.c | 3 | ||||
| -rw-r--r-- | src/mainboard/google/poppy/variants/baseboard/nhlt.c | 3 | ||||
| -rw-r--r-- | src/mainboard/google/poppy/variants/nocturne/nhlt.c | 3 | ||||
| -rw-r--r-- | src/mainboard/google/poppy/variants/rammus/nhlt.c | 3 |
5 files changed, 11 insertions, 6 deletions
diff --git a/src/mainboard/google/eve/mainboard.c b/src/mainboard/google/eve/mainboard.c index 4abb91e57ff2..efe47a0b1230 100644 --- a/src/mainboard/google/eve/mainboard.c +++ b/src/mainboard/google/eve/mainboard.c @@ -34,7 +34,7 @@ static unsigned long mainboard_write_acpi_tables( nhlt->subsystem_id = SUBSYSTEM_ID; /* 4 Channel DMIC array */ - if (nhlt_soc_add_rt5514(nhlt, AUDIO_LINK_SSP0, 4)) + if (nhlt_soc_add_rt5514(nhlt, AUDIO_LINK_SSP0, 4, 1)) printk(BIOS_ERR, "Couldn't add rt5514.\n"); /* RT5663 Headset codec */ @@ -42,7 +42,8 @@ static unsigned long mainboard_write_acpi_tables( printk(BIOS_ERR, "Couldn't add headset codec.\n"); /* MAXIM98927 Smart Amps for left and right channel */ - if (nhlt_soc_add_max98927(nhlt, AUDIO_LINK_SSP0)) + /* Render time_slot is 0 and feedback time_slot is 2 */ + if (nhlt_soc_add_max98927(nhlt, AUDIO_LINK_SSP0, 0, 2)) printk(BIOS_ERR, "Couldn't add max98927\n"); end_addr = nhlt_soc_serialize_oem_overrides(nhlt, start_addr, diff --git a/src/mainboard/google/poppy/variants/atlas/nhlt.c b/src/mainboard/google/poppy/variants/atlas/nhlt.c index 4d54772b28e8..ee642c0fc6fa 100644 --- a/src/mainboard/google/poppy/variants/atlas/nhlt.c +++ b/src/mainboard/google/poppy/variants/atlas/nhlt.c @@ -16,7 +16,8 @@ void variant_nhlt_init(struct nhlt *nhlt) printk(BIOS_ERR, "Couldn't add Dialog DA7219 codec.\n"); /* MAXIM Smart Amps for left and right speakers. */ - if (nhlt_soc_add_max98373(nhlt, AUDIO_LINK_SSP0)) + /* Render time_slot is 0 and feedback time_slot is 2 */ + if (nhlt_soc_add_max98373(nhlt, AUDIO_LINK_SSP0, 0, 2)) printk(BIOS_ERR, "Couldn't add Maxim 98373 codec.\n"); } diff --git a/src/mainboard/google/poppy/variants/baseboard/nhlt.c b/src/mainboard/google/poppy/variants/baseboard/nhlt.c index eef3abcecd46..b3ead3b3de90 100644 --- a/src/mainboard/google/poppy/variants/baseboard/nhlt.c +++ b/src/mainboard/google/poppy/variants/baseboard/nhlt.c @@ -16,7 +16,8 @@ void __weak variant_nhlt_init(struct nhlt *nhlt) printk(BIOS_ERR, "Couldn't add 4CH DMIC arrays.\n"); /* Maxim MAX98927 Smart Amps for left and right channel */ - if (nhlt_soc_add_max98927(nhlt, AUDIO_LINK_SSP0)) + /* Render time_slot is 0 and feedback time_slot is 2 */ + if (nhlt_soc_add_max98927(nhlt, AUDIO_LINK_SSP0, 0, 2)) printk(BIOS_ERR, "Couldn't add Maxim MAX98927\n"); /* Realtek RT5663 Headset codec. */ diff --git a/src/mainboard/google/poppy/variants/nocturne/nhlt.c b/src/mainboard/google/poppy/variants/nocturne/nhlt.c index 55787d1367ba..a3b239932c2f 100644 --- a/src/mainboard/google/poppy/variants/nocturne/nhlt.c +++ b/src/mainboard/google/poppy/variants/nocturne/nhlt.c @@ -12,7 +12,8 @@ void variant_nhlt_init(struct nhlt *nhlt) printk(BIOS_ERR, "Couldn't add 4CH DMIC array.\n"); /* MAXIM Smart Amps for left and right speakers. */ - if (nhlt_soc_add_max98373(nhlt, AUDIO_LINK_SSP0)) + /* Render time_slot is 0 and feedback time_slot is 2 */ + if (nhlt_soc_add_max98373(nhlt, AUDIO_LINK_SSP0, 0, 2)) printk(BIOS_ERR, "Couldn't add Maxim 98373 codec.\n"); } diff --git a/src/mainboard/google/poppy/variants/rammus/nhlt.c b/src/mainboard/google/poppy/variants/rammus/nhlt.c index 580288311847..14c6e708f79b 100644 --- a/src/mainboard/google/poppy/variants/rammus/nhlt.c +++ b/src/mainboard/google/poppy/variants/rammus/nhlt.c @@ -16,7 +16,8 @@ void variant_nhlt_init(struct nhlt *nhlt) printk(BIOS_ERR, "Couldn't add Dialog DA7219.\n"); /* Maxim MAX98927 Smart Amps for left and right channel */ - if (nhlt_soc_add_max98927(nhlt, AUDIO_LINK_SSP0)) + /* Render time_slot is 0 and feedback time_slot is 2 */ + if (nhlt_soc_add_max98373(nhlt, AUDIO_LINK_SSP0, 0, 2)) printk(BIOS_ERR, "Couldn't add Maxim MAX98927\n"); } |