[coreboot-gerrit] Change in coreboot[master]: intel/skylake: nhlt: Add 48Khz 2ch 16bit config for max98927

[Duncan Laurie (Code Review)]

Duncan Laurie has submitted this change and it was merged. ( https://review.coreboot.org/19548 )

Change subject: intel/skylake: nhlt: Add 48Khz 2ch 16bit config for max98927
......................................................................


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 at chromium.org>
Reviewed-on: https://review.coreboot.org/19548
Reviewed-by: Aaron Durbin <adurbin at chromium.org>
Reviewed-by: Furquan Shaikh <furquan at google.com>
Tested-by: build bot (Jenkins) <no-reply at coreboot.org>
---
M src/soc/intel/skylake/nhlt/Makefile.inc
M src/soc/intel/skylake/nhlt/max98927.c
2 files changed, 18 insertions(+), 4 deletions(-)

Approvals:
  Aaron Durbin: Looks good to me, approved
  build bot (Jenkins): Verified
  Furquan Shaikh: Looks good to me, approved



diff --git a/src/soc/intel/skylake/nhlt/Makefile.inc b/src/soc/intel/skylake/nhlt/Makefile.inc
index 39031a5..35b2829 100644
--- a/src/soc/intel/skylake/nhlt/Makefile.inc
+++ b/src/soc/intel/skylake/nhlt/Makefile.inc
@@ -19,7 +19,8 @@
 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 @@
 $(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 77b72aa..8b14df7 100644
--- a/src/soc/intel/skylake/nhlt/max98927.c
+++ b/src/soc/intel/skylake/nhlt/max98927.c
@@ -25,6 +25,15 @@
 		.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[] = {

-- 
To view, visit https://review.coreboot.org/19548
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieda988b557ecefdace5f81b474a952af56e69315
Gerrit-PatchSet: 2
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Owner: Duncan Laurie <dlaurie at chromium.org>
Gerrit-Reviewer: Aaron Durbin <adurbin at chromium.org>
Gerrit-Reviewer: Duncan Laurie <dlaurie at chromium.org>
Gerrit-Reviewer: Furquan Shaikh <furquan at google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply at coreboot.org>