summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncan Laurie <dlaurie@chromium.org>2017-05-03 10:05:27 -0700
committerDuncan Laurie <dlaurie@chromium.org>2017-05-04 01:57:36 +0200
commitfff2e6c5561889aaf0dec3b8c94f642aec8701ed (patch)
treea39c7c5b6ce0e9e06d196104e563bdc84925c7e8
parentdcc4d431517b7bb4008bd1aea376183d61507bb3 (diff)
intel/skylake: nhlt: Add 48Khz 2ch 16bit config for max98927
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: Ieda988b557ecefdace5f81b474a952af56e69315 Signed-off-by: Duncan Laurie <dlaurie@chromium.org> Reviewed-on: https://review.coreboot.org/19548 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Furquan Shaikh <furquan@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/soc/intel/skylake/nhlt/Makefile.inc13
-rw-r--r--src/soc/intel/skylake/nhlt/max98927.c9
2 files changed, 18 insertions, 4 deletions
diff --git a/src/soc/intel/skylake/nhlt/Makefile.inc b/src/soc/intel/skylake/nhlt/Makefile.inc
index 39031a591d..35b2829a77 100644
--- a/src/soc/intel/skylake/nhlt/Makefile.inc
+++ b/src/soc/intel/skylake/nhlt/Makefile.inc
@@ -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
diff --git a/src/soc/intel/skylake/nhlt/max98927.c b/src/soc/intel/skylake/nhlt/max98927.c
index 77b72aa4e6..8b14df7eef 100644
--- a/src/soc/intel/skylake/nhlt/max98927.c
+++ b/src/soc/intel/skylake/nhlt/max98927.c
@@ -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[] = {