Skip to content

byt: fix sporadic channel swap #3777

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
keyonjie merged 1 commit into from
Jan 25, 2021
Merged

byt: fix sporadic channel swap #3777

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions src/drivers/intel/baytrail/ssp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,14 +140,6 @@ static int ssp_set_config(struct dai *dai,
* I2S_TX_EN, I2S_RX_EN, I2S_CLK_MST
*/
sscr3 = SSCR3_SYN_FIX_EN;
#ifdef ENABLE_SSRC3_FIXES
/*
* this seems to prevent DSP modes from working but is harmless for
* I2S and LEFT_J. Keep with ifdef in case it's ever needed.
*/
sscr3 |= SSCR3_I2S_TX_SS_FIX_EN | SSCR3_I2S_RX_SS_FIX_EN |
SSCR3_STRETCH_TX | SSCR3_STRETCH_RX;
#endif

#ifdef ENABLE_CLK_EDGE_SEL /* FIXME: is this needed ? */
sscr3 |= SSCR3_CLK_EDGE_SEL;
Expand Down Expand Up @@ -331,7 +323,9 @@ static int ssp_set_config(struct dai *dai,

/* handle frame polarity, I2S default is falling/active low */
sspsp |= SSPSP_SFRMP(!inverted_frame);
sscr3 |= SSCR3_I2S_FRM_POL(!inverted_frame);
sscr3 |= SSCR3_I2S_FRM_POL(!inverted_frame) |
SSCR3_I2S_TX_SS_FIX_EN | SSCR3_I2S_RX_SS_FIX_EN |
SSCR3_STRETCH_TX | SSCR3_STRETCH_RX;

if (cbs) {
/*
Expand Down Expand Up @@ -361,7 +355,9 @@ static int ssp_set_config(struct dai *dai,

/* LEFT_J default is rising/active high, opposite of I2S */
sspsp |= SSPSP_SFRMP(inverted_frame);
sscr3 |= SSCR3_I2S_FRM_POL(inverted_frame);
sscr3 |= SSCR3_I2S_FRM_POL(inverted_frame) |
SSCR3_I2S_TX_SS_FIX_EN | SSCR3_I2S_RX_SS_FIX_EN |
SSCR3_STRETCH_TX | SSCR3_STRETCH_RX;

if (cbs) {
/*
Expand Down