summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/soc/intel/apollolake/Kconfig7
-rw-r--r--src/soc/intel/apollolake/Makefile.inc5
-rw-r--r--src/soc/intel/apollolake/include/soc/nhlt.h1
-rw-r--r--src/soc/intel/apollolake/nhlt.c54
4 files changed, 67 insertions, 0 deletions
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index 0f1f12152b..5df5ed1b56 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -293,6 +293,13 @@ config NHLT_DA7219
help
Include DSP firmware settings for headset codec.
+config NHLT_RT5682
+ bool
+ depends on ACPI_NHLT
+ default n
+ help
+ Include DSP firmware settings for headset codec.
+
choice
prompt "Cache-as-ram implementation"
default CAR_CQOS if !SOC_INTEL_GLK
diff --git a/src/soc/intel/apollolake/Makefile.inc b/src/soc/intel/apollolake/Makefile.inc
index 5c060ada7a..9b09b09f44 100644
--- a/src/soc/intel/apollolake/Makefile.inc
+++ b/src/soc/intel/apollolake/Makefile.inc
@@ -151,6 +151,7 @@ DMIC_2CH_48KHZ_16B = dmic-2ch-48khz-16b.bin
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 @@ cbfs-files-$(CONFIG_NHLT_DA7219) += $(DA7219_RENDER_CAPTURE)
$(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 d49b8cf1cb..226fc8a23d 100644
--- a/src/soc/intel/apollolake/include/soc/nhlt.h
+++ b/src/soc/intel/apollolake/include/soc/nhlt.h
@@ -39,5 +39,6 @@ enum {
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 a86da88fa2..a46b188a95 100644
--- a/src/soc/intel/apollolake/nhlt.c
+++ b/src/soc/intel/apollolake/nhlt.c
@@ -197,6 +197,53 @@ int nhlt_soc_add_dmic_array(struct nhlt *nhlt, int num_channels)
}
}
+/*
+ * 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 @@ int nhlt_soc_add_max98357(struct nhlt *nhlt, int hwlink)
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));
+}