michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: ssp: Program slot number basing on blob

Browse source 
The upper ssp slot number should be retrieved from configuration
blob to support all possible settings. This patch fix this issue.

Signed-off-by: Jaroslaw Stelter <Jaroslaw.Stelter@intel.com>
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Jaroslaw Stelter 2023-01-26 13:48:01 +01:00 • committed by Anas Nashif
commit 3b518743d2
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
drivers/dai/intel/ssp/ssp.c
View file

@ -787,6 +787,10 @@ static void dai_ssp_program_channel_map(struct dai_intel_ssp *dp,
{ {
#ifdef CONFIG_SOC_INTEL_ACE20_LNL #ifdef CONFIG_SOC_INTEL_ACE20_LNL
uint16_t pcmsycm = cfg->link_config; uint16_t pcmsycm = cfg->link_config;
struct dai_intel_ssp_pdata *ssp = dai_get_drvdata(dp);
/* Set upper slot number from configuration */
pcmsycm = pcmsycm | (ssp->params.tdm_slots - 1) << 4;
if (DAI_INTEL_SSP_IS_BIT_SET(pcmsycm, 15)) { if (DAI_INTEL_SSP_IS_BIT_SET(pcmsycm, 15)) {
uint32_t reg_add = dai_ip_base(dp) + 0x1000 * index + PCMS0CM_OFFSET; uint32_t reg_add = dai_ip_base(dp) + 0x1000 * index + PCMS0CM_OFFSET;
@ -2082,14 +2086,15 @@ static int dai_ssp_config_set(const struct device *dev, const struct dai_config
const void *bespoke_cfg) const void *bespoke_cfg)
{ {
struct dai_intel_ssp *dp = (struct dai_intel_ssp *)dev->data; struct dai_intel_ssp *dp = (struct dai_intel_ssp *)dev->data;
int ret;
if (cfg->type == DAI_INTEL_SSP) { if (cfg->type == DAI_INTEL_SSP) {
dai_ssp_program_channel_map(dp, cfg, dp->index); ret = dai_ssp_set_config_tplg(dp, cfg, bespoke_cfg);
return dai_ssp_set_config_tplg(dp, cfg, bespoke_cfg);
} else { } else {
dai_ssp_program_channel_map(dp, cfg, dp->index); ret = dai_ssp_set_config_blob(dp, cfg, bespoke_cfg);
return dai_ssp_set_config_blob(dp, cfg, bespoke_cfg);
} }
dai_ssp_program_channel_map(dp, cfg, dp->index);
return ret;
} }
static const struct dai_properties *dai_ssp_get_properties(const struct device *dev, static const struct dai_properties *dai_ssp_get_properties(const struct device *dev,