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@intel.com> Reviewed-on: https://review.coreboot.org/26057 Reviewed-by: Furquan Shaikh <furquan@google.com> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
committed by
Martin Roth
parent
ebdeb4d07d
commit
532b8d5f25
@ -293,6 +293,13 @@ config NHLT_DA7219
|
|||||||
help
|
help
|
||||||
Include DSP firmware settings for headset codec.
|
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
|
choice
|
||||||
prompt "Cache-as-ram implementation"
|
prompt "Cache-as-ram implementation"
|
||||||
default CAR_CQOS if !SOC_INTEL_GLK
|
default CAR_CQOS if !SOC_INTEL_GLK
|
||||||
|
@ -151,6 +151,7 @@ DMIC_2CH_48KHZ_16B = dmic-2ch-48khz-16b.bin
|
|||||||
DMIC_4CH_48KHZ_16B = dmic-4ch-48khz-16b.bin
|
DMIC_4CH_48KHZ_16B = dmic-4ch-48khz-16b.bin
|
||||||
MAX98357_RENDER = max98357-render-2ch-48khz-24b.bin
|
MAX98357_RENDER = max98357-render-2ch-48khz-24b.bin
|
||||||
DA7219_RENDER_CAPTURE = dialog-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)
|
cbfs-files-$(CONFIG_NHLT_DMIC_1CH_16B) += $(DMIC_1CH_48KHZ_16B)
|
||||||
$(DMIC_1CH_48KHZ_16B)-file := $(NHLT_BLOB_PATH)/$(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)-file := $(NHLT_BLOB_PATH)/$(DA7219_RENDER_CAPTURE)
|
||||||
$(DA7219_RENDER_CAPTURE)-type := raw
|
$(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
|
endif
|
||||||
|
@ -39,5 +39,6 @@ enum {
|
|||||||
int nhlt_soc_add_dmic_array(struct nhlt *nhlt, int num_channels);
|
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_max98357(struct nhlt *nhlt, int hwlink);
|
||||||
int nhlt_soc_add_da7219(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
|
#endif
|
||||||
|
@ -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)
|
int nhlt_soc_add_da7219(struct nhlt *nhlt, int hwlink)
|
||||||
{
|
{
|
||||||
/* Virtual bus id of SSP links are the hardware port ids proper. */
|
/* 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,
|
return nhlt_add_ssp_endpoints(nhlt, hwlink, max98357_descriptors,
|
||||||
ARRAY_SIZE(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));
|
||||||
|
}
|
||||||
|
Reference in New Issue
Block a user