OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

drivers: imx: SAI : don't generate clocks in slave mode 

The test determinating the current SAI mode (M/S) was buggy.
As a consequence SAI generated bit clock and FS clock when the codec was
in master mode (which is the default configuration for SAI currently with
SOF). This bug didn't prevent the DAI to function and to have good sound.

Signed-off-by: Jerome Laclavere <jerome.laclavere@nxp.com>
Signed-off-by: Guido Roncarolo <guido.roncarolo@nxp.com>
This commit is contained in:
Jerome Laclavere 2019-11-07 11:04:12 +01:00 committed by Daniel Baluta
parent de22810b0f
commit fb068e6a7a
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/drivers/imx/sai.c
View File

@ -176,25 +176,31 @@ static inline int sai_set_config(struct dai *dai,
/* DAI clock master masks */
switch (config->format & SOF_DAI_FMT_MASTER_MASK) {
case SOF_DAI_FMT_CBS_CFS:
break;
case SOF_DAI_FMT_CBM_CFM:
trace_sai("SAI: codec is slave");
val_cr2 |= REG_SAI_CR2_MSEL_MCLK1;
val_cr2 |= REG_SAI_CR2_BCD_MSTR;
val_cr2 |= SAI_CLOCK_DIV; /* TODO: determine dynamically.*/
val_cr4 |= REG_SAI_CR4_FSD_MSTR;
break;
case SOF_DAI_FMT_CBM_CFM:
trace_sai("SAI: codec is master");
/*
* fields CR2_DIV and CR2_MSEL not relevant in slave mode.
* fields CR2_BCD and CR4_MFSD already at 0
*/
break;
case SOF_DAI_FMT_CBS_CFM:
val_cr4 |= REG_SAI_CR4_FSD_MSTR;
val_cr2 |= REG_SAI_CR2_BCD_MSTR;
val_cr2 |= SAI_CLOCK_DIV; /* TODO: determine dynamically.*/
break;
case SOF_DAI_FMT_CBM_CFS:
val_cr2 |= REG_SAI_CR2_BCD_MSTR;
val_cr4 |= REG_SAI_CR4_FSD_MSTR;
val_cr2 |= SAI_CLOCK_DIV; /* TODO: determine dynamically.*/
break;
default:
return -EINVAL;
}
/* set clock divider as (DIV + 1) * 2 */
val_cr2 |= SAI_CLOCK_DIV;
/* TODO: set number of slots from config */
val_cr4 |= REG_SAI_CR4_FRSZ(SAI_TDM_SLOTS);