Skip to content

Commit 05d07bb

Browse files
authored
Merge pull request #147 from slawblauciak/slave_fix
drivers: i2s frame clock slave mode
2 parents ff22d80 + 6a6cdf7 commit 05d07bb

1 file changed

Lines changed: 2 additions & 16 deletions

File tree

src/drivers/apl-ssp.c

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -208,34 +208,20 @@ static inline int ssp_set_config(struct dai *dai,
208208
/* ssrsa dynamic setting is RTSA, default 2 slots */
209209
ssrsa = config->ssp.rx_slots;
210210

211-
/* clock masters */
212-
sscr1 &= ~SSCR1_SFRMDIR;
213-
214211
trace_value(config->format);
215212
switch (config->format & SOF_DAI_FMT_MASTER_MASK) {
216213
case SOF_DAI_FMT_CBM_CFM:
217-
sscr0 |= SSCR0_ECS; /* external clock used */
218-
sscr1 |= SSCR1_SCLKDIR;
219-
/*
220-
* FIXME: does SSRC1.SCFR need to be set
221-
* when codec is master ?
222-
*/
214+
sscr1 |= SSCR1_SCLKDIR | SSCR1_SFRMDIR;
223215
break;
224216
case SOF_DAI_FMT_CBS_CFS:
225217
sscr1 |= SSCR1_SCFR;
226-
ssioc |= SSIOC_SFCR;
227218
break;
228219
case SOF_DAI_FMT_CBM_CFS:
229-
sscr0 |= SSCR0_ECS; /* external clock used */
230220
sscr1 |= SSCR1_SCLKDIR;
231-
/*
232-
* FIXME: does SSRC1.SCFR need to be set
233-
* when codec is master ?
234-
*/
235221
/* FIXME: this mode has not been tested */
236222
break;
237223
case SOF_DAI_FMT_CBS_CFM:
238-
sscr1 |= SSCR1_SCFR;
224+
sscr1 |= SSCR1_SCFR | SSCR1_SFRMDIR;
239225
/* FIXME: this mode has not been tested */
240226
break;
241227
default:

0 commit comments

Comments
 (0)