erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UPSTREAM: intel/skylake: nhlt: Add 48Khz 2ch 16bit config for max98927

Browse source 
This changelist adds the 48Khz 2ch 16bit NHLT configuration for the
Maxim 98927 speaker amplifier codec.

BUG=b:35585307
TEST=manual testing to ensure speaker output is functional on Eve board

Change-Id: Ie41546ea287a27a8ef91b96fbd2c01a9350b1539
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: fff2e6c556
Original-Change-Id: Ieda988b557ecefdace5f81b474a952af56e69315
Original-Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Original-Reviewed-on: https://review.coreboot.org/19548
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Original-Reviewed-by: Furquan Shaikh <furquan@google.com>
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-on: https://chromium-review.googlesource.com/496048
Commit-Ready: Duncan Laurie <dlaurie@google.com>
This commit is contained in:
Duncan Laurie 2017-05-03 10:05:27 -07:00 • committed by chrome-bot
commit 6a578b5cda
2 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/soc/intel/skylake/nhlt/Makefile.inc
View file

@ -19,7 +19,8 @@ DMIC_4CH_48KHZ_16B = dmic-4ch-48khz-16b.bin
DMIC_4CH_48KHZ_32B = dmic-4ch-48khz-32b.bin
NAU88L25 = nau88l25-2ch-48khz-24b.bin
MAX98357_RENDER = max98357-render-2ch-48khz-24b.bin
MAX98927_RENDER = max98927-render-2ch-48khz-24b.bin
MAX98927_RENDER_24B = max98927-render-2ch-48khz-24b.bin
MAX98927_RENDER_16B = max98927-render-2ch-48khz-16b.bin
RT5514_CAPTURE = rt5514-capture-4ch-48khz-16b.bin
RT5663 = rt5663-2ch-48khz-24b.bin
SSM4567_RENDER = ssm4567-render-2ch-48khz-24b.bin
@ -65,6 +66,10 @@ cbfs-files-$(CONFIG_NHLT_RT5663) += $(RT5663)
$(RT5663)-file := $(NHLT_BLOB_PATH)/$(RT5663)
$(RT5663)-type := raw
cbfs-files-$(CONFIG_NHLT_MAX98927) += $(MAX98927_RENDER)
$(MAX98927_RENDER)-file := $(NHLT_BLOB_PATH)/$(MAX98927_RENDER)
$(MAX98927_RENDER)-type := raw
cbfs-files-$(CONFIG_NHLT_MAX98927) += $(MAX98927_RENDER_16B)
$(MAX98927_RENDER_16B)-file := $(NHLT_BLOB_PATH)/$(MAX98927_RENDER_16B)
$(MAX98927_RENDER_16B)-type := raw
cbfs-files-$(CONFIG_NHLT_MAX98927) += $(MAX98927_RENDER_24B)
$(MAX98927_RENDER_24B)-file := $(NHLT_BLOB_PATH)/$(MAX98927_RENDER_24B)
$(MAX98927_RENDER_24B)-type := raw

9
src/soc/intel/skylake/nhlt/max98927.c
View file

@ -25,6 +25,15 @@ static const struct nhlt_format_config max98927_render_formats[] = {
.speaker_mask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT,
.settings_file = "max98927-render-2ch-48khz-24b.bin",
},
/* 48 KHz 16-bits per sample. */
{
.num_channels = 2,
.sample_freq_khz = 48,
.container_bits_per_sample = 16,
.valid_bits_per_sample = 16,
.speaker_mask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT,
.settings_file = "max98927-render-2ch-48khz-16b.bin",
},
};
static const struct nhlt_endp_descriptor max98927_descriptors[] = {