diff options
| author | N, Harshapriya <harshapriya.n@intel.com> | 2017-11-28 14:29:26 -0800 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2018-01-23 05:17:17 +0000 |
| commit | 4a1ee4b53ec2eed6c9e8129381982c300fa87031 (patch) | |
| tree | 2a2242ffda72f3342a5bc17a39867753cb4295a2 /src/soc/intel/cannonlake/nhlt.c | |
| parent | c14a99fedac6d054f958ab86bf68c8ae3966e9fe (diff) | |
mainboard/intel/cannonlake_rvp: Add support for MAX98373 speaker amp
Add NHLT and dt support for max98373 amp
BUG=None
TEST=check SSDT and verify entries for max98373
TEST=check NHLT ACPI tables included blobs for max98373
Change-Id: I0b402f89f1ece9e62a394f713c4b0feff29bd1e5
Signed-off-by: N, Harshapriya <harshapriya.n@intel.com>
Signed-off-by: Sathyanarayana Nujella <sathyanarayana.nujella@intel.com>
Reviewed-on: https://review.coreboot.org/22674
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/soc/intel/cannonlake/nhlt.c')
| -rw-r--r-- | src/soc/intel/cannonlake/nhlt.c | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/src/soc/intel/cannonlake/nhlt.c b/src/soc/intel/cannonlake/nhlt.c index 9ca54eb09b..ff1b4464ba 100644 --- a/src/soc/intel/cannonlake/nhlt.c +++ b/src/soc/intel/cannonlake/nhlt.c @@ -180,6 +180,60 @@ static const struct nhlt_endp_descriptor max98357_descriptors[] = { }, }; +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, + .sample_freq_khz = 48, + .container_bits_per_sample = 16, + .valid_bits_per_sample = 16, + .speaker_mask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT, + .settings_file = "max98373-render-2ch-48khz-16b.bin", + } +}; + +static const struct nhlt_format_config max98373_capture_formats[] = { + /* 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 = "max98373-render-2ch-48khz-16b.bin", + }, +}; + +static const struct nhlt_endp_descriptor max98373_descriptors[] = { + { + .link = NHLT_LINK_SSP, + .device = NHLT_SSP_DEV_I2S, + .direction = NHLT_DIR_RENDER, + .vid = NHLT_VID, + .did = NHLT_DID_SSP, + .formats = max98373_render_formats, + .num_formats = ARRAY_SIZE(max98373_render_formats), + }, + { + .link = NHLT_LINK_SSP, + .device = NHLT_SSP_DEV_I2S, + .direction = NHLT_DIR_CAPTURE, + .vid = NHLT_VID, + .did = NHLT_DID_SSP, + .formats = max98373_capture_formats, + .num_formats = ARRAY_SIZE(max98373_capture_formats), + }, +}; + int nhlt_soc_add_dmic_array(struct nhlt *nhlt, int num_channels) { switch (num_channels) { @@ -210,3 +264,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_max98373(struct nhlt *nhlt, int hwlink) +{ + /* Virtual bus id of SSP links are the hardware port ids proper. */ + return nhlt_add_ssp_endpoints(nhlt, hwlink, max98373_descriptors, + ARRAY_SIZE(max98373_descriptors)); +} |