[coreboot-gerrit] Change in coreboot[master]: soc/intel/apollolake: add rt5682 NHLT support

[Naveen Manohar (Code Review)]

Naveen Manohar has uploaded this change for review. ( https://review.coreboot.org/26057


Change subject: soc/intel/apollolake: add rt5682 NHLT support
......................................................................

soc/intel/apollolake: add rt5682 NHLT support

Add APIs and required parameters for creating Realtek 5682 SSP
endpoint in NHLT table.

BUG=b:79235534
TEST=check that NHLT table defined is created properly.
With the series merged & required driver support in kernel.
Verify Headset Audio playback.

Change-Id: Ic26a0b881f77af64ba00fd714b08c0f17c0acb3d
Signed-off-by: Naveen Manohar <naveen.m at intel.com>
---
M src/mainboard/intel/glkrvp/Kconfig
M src/soc/intel/apollolake/Makefile.inc
M src/soc/intel/apollolake/include/soc/nhlt.h
M src/soc/intel/apollolake/nhlt.c
4 files changed, 61 insertions(+), 0 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/57/26057/1

diff --git a/src/mainboard/intel/glkrvp/Kconfig b/src/mainboard/intel/glkrvp/Kconfig
index 3451640..7b72412 100644
--- a/src/mainboard/intel/glkrvp/Kconfig
+++ b/src/mainboard/intel/glkrvp/Kconfig
@@ -87,6 +87,7 @@
 	select NHLT_DMIC_4CH_16B
 	select NHLT_DA7219
 	select NHLT_MAX98357
+	select NHLT_RT5682
 
 config IS_GLK_RVP_1
 	bool "Is this RVP1?"
diff --git a/src/soc/intel/apollolake/Makefile.inc b/src/soc/intel/apollolake/Makefile.inc
index 5c060ad..9b09b09 100644
--- a/src/soc/intel/apollolake/Makefile.inc
+++ b/src/soc/intel/apollolake/Makefile.inc
@@ -151,6 +151,7 @@
 DMIC_4CH_48KHZ_16B = dmic-4ch-48khz-16b.bin
 MAX98357_RENDER = max98357-render-2ch-48khz-24b.bin
 DA7219_RENDER_CAPTURE = dialog-2ch-48khz-24b.bin
+RT5682_RENDER_CAPTURE = rt5682-2ch-48khz-24b.bin
 
 cbfs-files-$(CONFIG_NHLT_DMIC_1CH_16B) += $(DMIC_1CH_48KHZ_16B)
 $(DMIC_1CH_48KHZ_16B)-file := $(NHLT_BLOB_PATH)/$(DMIC_1CH_48KHZ_16B)
@@ -172,4 +173,8 @@
 $(DA7219_RENDER_CAPTURE)-file := $(NHLT_BLOB_PATH)/$(DA7219_RENDER_CAPTURE)
 $(DA7219_RENDER_CAPTURE)-type := raw
 
+cbfs-files-$(CONFIG_NHLT_RT5682) += $(RT5682_RENDER_CAPTURE)
+$(RT5682_RENDER_CAPTURE)-file := $(NHLT_BLOB_PATH)/$(RT5682_RENDER_CAPTURE)
+$(RT5682_RENDER_CAPTURE)-type := raw
+
 endif
diff --git a/src/soc/intel/apollolake/include/soc/nhlt.h b/src/soc/intel/apollolake/include/soc/nhlt.h
index d49b8cf..226fc8a 100644
--- a/src/soc/intel/apollolake/include/soc/nhlt.h
+++ b/src/soc/intel/apollolake/include/soc/nhlt.h
@@ -39,5 +39,6 @@
 int nhlt_soc_add_dmic_array(struct nhlt *nhlt, int num_channels);
 int nhlt_soc_add_max98357(struct nhlt *nhlt, int hwlink);
 int nhlt_soc_add_da7219(struct nhlt *nhlt, int hwlink);
+int nhlt_soc_add_rt5682(struct nhlt *nhlt, int hwlink);
 
 #endif
diff --git a/src/soc/intel/apollolake/nhlt.c b/src/soc/intel/apollolake/nhlt.c
index a86da88..a46b188 100644
--- a/src/soc/intel/apollolake/nhlt.c
+++ b/src/soc/intel/apollolake/nhlt.c
@@ -197,6 +197,53 @@
 	}
 }
 
+/*
+ * The same DSP firmware settings are used for both the capture and
+ * render endpoints.
+*/
+static const struct nhlt_format_config rt5682_formats[] = {
+	/* 48 KHz 24-bits per sample. */
+	{
+		.num_channels = 2,
+		.sample_freq_khz = 48,
+		.container_bits_per_sample = 32,
+		.valid_bits_per_sample = 24,
+		.speaker_mask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT,
+		.settings_file = "rt5682-2ch-48khz-24b.bin",
+	},
+};
+
+/*
+ * The rt5682 just has headphones and a mic. Both the capture and render
+ * endpoints occupy the same virtual slot.
+*/
+static const struct nhlt_endp_descriptor rt5682_descriptors[] = {
+	/* Render Endpoint */
+	{
+		.link = NHLT_LINK_SSP,
+		.device = NHLT_SSP_DEV_I2S,
+		.direction = NHLT_DIR_RENDER,
+		.vid = NHLT_VID,
+		.did = NHLT_DID_SSP,
+		.cfg = &tdm_config,
+		.cfg_size = sizeof(tdm_config),
+		.formats = rt5682_formats,
+		.num_formats = ARRAY_SIZE(rt5682_formats),
+	},
+	/* Capture Endpoint */
+	{
+		.link = NHLT_LINK_SSP,
+		.device = NHLT_SSP_DEV_I2S,
+		.direction = NHLT_DIR_CAPTURE,
+		.vid = NHLT_VID,
+		.did = NHLT_DID_SSP,
+		.cfg = &tdm_config,
+		.cfg_size = sizeof(tdm_config),
+		.formats = rt5682_formats,
+		.num_formats = ARRAY_SIZE(rt5682_formats),
+	},
+};
+
 int nhlt_soc_add_da7219(struct nhlt *nhlt, int hwlink)
 {
 	/* Virtual bus id of SSP links are the hardware port ids proper. */
@@ -210,3 +257,10 @@
 	return nhlt_add_ssp_endpoints(nhlt, hwlink, max98357_descriptors,
 					ARRAY_SIZE(max98357_descriptors));
 }
+
+int nhlt_soc_add_rt5682(struct nhlt *nhlt, int hwlink)
+{
+        /* Virtual bus id of SSP links are the hardware port ids proper. */
+        return nhlt_add_ssp_endpoints(nhlt, hwlink, rt5682_descriptors,
+                                        ARRAY_SIZE(rt5682_descriptors));
+}

-- 
To view, visit https://review.coreboot.org/26057
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic26a0b881f77af64ba00fd714b08c0f17c0acb3d
Gerrit-Change-Number: 26057
Gerrit-PatchSet: 1
Gerrit-Owner: Naveen Manohar <naveen.m at intel.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180504/1dc83dbe/attachment-0001.html>