diff options
| author | Matt DeVillier <matt.devillier@gmail.com> | 2022-12-06 20:46:36 -0600 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2022-12-21 13:57:48 +0000 |
| commit | ca342e108227859112746bb262bb742e800b6973 (patch) | |
| tree | 1c09bf6bcaa5d2359abd8114b6b469ef356d557a /src/soc/intel/skylake | |
| parent | 343644006f89d201b42e9f340f9907b2eea56b5b (diff) | |
lib/nhlt, soc/intel/skl: Update NHLT to program feedback config
Adapted from WIP (and abandoned) patch CB:25334, this patch:
1. Ensures SSP endpoint InstanceId is 0
2. Adds capability_size parameter at the end of the nhlt
3. Adsd more config_type enum values to accommodate feedback stream
4. Programs virtual_slot values for max98373, max98927,
and rt5514 nhlt files
5. Adds NHLT feedback_config parameters
Default feedback configs are added here to the max98373, max98927, and
rt5514 codecs; in a follow-on patch, these will be overridden at the
board level.
TEST=tested with subsequent patch
Change-Id: I59285e332de09bb448b0d67ad56c72a208588d47
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70393
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: CoolStar <coolstarorganization@gmail.com>
Diffstat (limited to 'src/soc/intel/skylake')
| -rw-r--r-- | src/soc/intel/skylake/nhlt/max98373.c | 33 | ||||
| -rw-r--r-- | src/soc/intel/skylake/nhlt/max98927.c | 37 | ||||
| -rw-r--r-- | src/soc/intel/skylake/nhlt/rt5514.c | 1 |
3 files changed, 52 insertions, 19 deletions
diff --git a/src/soc/intel/skylake/nhlt/max98373.c b/src/soc/intel/skylake/nhlt/max98373.c index f072f36935..5f4d15ee25 100644 --- a/src/soc/intel/skylake/nhlt/max98373.c +++ b/src/soc/intel/skylake/nhlt/max98373.c @@ -4,15 +4,6 @@ #include <soc/nhlt.h> static const struct nhlt_format_config max98373_render_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 = "max98373-render-2ch-48khz-24b.bin", - }, /* 48 KHz 16-bits per sample. */ { .num_channels = 2, @@ -45,6 +36,26 @@ static const struct nhlt_format_config max98373_capture_formats[] = { }, }; +static struct nhlt_feedback_config render_config = { + .tdm_config = { + .virtual_slot = 0x0, + .config_type = NHLT_TDM_RENDER_FEEDBACK, + }, + .feedback_virtual_slot = 2, + .feedback_channels = 4, + .feedback_valid_bits_per_sample = 16, +}; + +static struct nhlt_feedback_config capture_config = { + .tdm_config = { + .virtual_slot = 0x2, + .config_type = NHLT_TDM_RENDER_FEEDBACK, + }, + .feedback_virtual_slot = 0, + .feedback_channels = 2, + .feedback_valid_bits_per_sample = 16, +}; + static const struct nhlt_endp_descriptor max98373_descriptors[] = { { .link = NHLT_LINK_SSP, @@ -52,6 +63,8 @@ static const struct nhlt_endp_descriptor max98373_descriptors[] = { .direction = NHLT_DIR_RENDER, .vid = NHLT_VID, .did = NHLT_DID_SSP, + .cfg = &render_config, + .cfg_size = sizeof(render_config), .formats = max98373_render_formats, .num_formats = ARRAY_SIZE(max98373_render_formats), }, @@ -61,6 +74,8 @@ static const struct nhlt_endp_descriptor max98373_descriptors[] = { .direction = NHLT_DIR_CAPTURE, .vid = NHLT_VID, .did = NHLT_DID_SSP, + .cfg = &capture_config, + .cfg_size = sizeof(capture_config), .formats = max98373_capture_formats, .num_formats = ARRAY_SIZE(max98373_capture_formats), }, diff --git a/src/soc/intel/skylake/nhlt/max98927.c b/src/soc/intel/skylake/nhlt/max98927.c index 77b8faf87f..b19db26224 100644 --- a/src/soc/intel/skylake/nhlt/max98927.c +++ b/src/soc/intel/skylake/nhlt/max98927.c @@ -4,15 +4,6 @@ #include <soc/nhlt.h> static const struct nhlt_format_config max98927_render_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 = "max98927-render-2ch-48khz-24b.bin", - }, /* 48 KHz 16-bits per sample. */ { .num_channels = 2, @@ -36,13 +27,37 @@ static const struct nhlt_format_config max98927_capture_formats[] = { .settings_file = "max98927-render-2ch-48khz-16b.bin", }, }; -static const struct nhlt_endp_descriptor max98927_descriptors[] = { + +static struct nhlt_feedback_config render_config = { + .tdm_config = { + .virtual_slot = 0x0, + .config_type = NHLT_TDM_RENDER_FEEDBACK, + }, + .feedback_virtual_slot = 2, + .feedback_channels = 4, + .feedback_valid_bits_per_sample = 16, +}; + +static struct nhlt_feedback_config capture_config = { + .tdm_config = { + .virtual_slot = 0x2, + .config_type = NHLT_TDM_RENDER_FEEDBACK, + }, + .feedback_virtual_slot = 0, + .feedback_channels = 2, + .feedback_valid_bits_per_sample = 16, +}; + + +static struct nhlt_endp_descriptor max98927_descriptors[] = { { .link = NHLT_LINK_SSP, .device = NHLT_SSP_DEV_I2S, .direction = NHLT_DIR_RENDER, .vid = NHLT_VID, .did = NHLT_DID_SSP, + .cfg = &render_config, + .cfg_size = sizeof(render_config), .formats = max98927_render_formats, .num_formats = ARRAY_SIZE(max98927_render_formats), }, @@ -52,6 +67,8 @@ static const struct nhlt_endp_descriptor max98927_descriptors[] = { .direction = NHLT_DIR_CAPTURE, .vid = NHLT_VID, .did = NHLT_DID_SSP, + .cfg = &capture_config, + .cfg_size = sizeof(capture_config), .formats = max98927_capture_formats, .num_formats = ARRAY_SIZE(max98927_capture_formats), }, diff --git a/src/soc/intel/skylake/nhlt/rt5514.c b/src/soc/intel/skylake/nhlt/rt5514.c index 35adccaa39..df4d1e00b3 100644 --- a/src/soc/intel/skylake/nhlt/rt5514.c +++ b/src/soc/intel/skylake/nhlt/rt5514.c @@ -18,6 +18,7 @@ static const struct nhlt_format_config rt5514_4ch_formats[] = { static const struct nhlt_dmic_array_config rt5514_4ch_mic_config = { .tdm_config = { + .virtual_slot = 0x1, .config_type = NHLT_TDM_MIC_ARRAY, }, .array_type = NHLT_MIC_ARRAY_4CH_L_SHAPED, |