Skip to content

ssp: disable SSP port during ssp_start() #3535

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

Closed
keyonjie wants to merge 2 commits into from
Closed

ssp: disable SSP port during ssp_start() #3535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ec4384
ssp: disable SSP port during ssp_start()
keyonjie Oct 20, 2020
32c70c4
baytrail: ssp: disable SSP port during ssp_start()
keyonjie Oct 20, 2020
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
19 changes: 15 additions & 4 deletions src/drivers/intel/baytrail/ssp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,21 +516,32 @@ static int ssp_get_hw_params(struct dai *dai,
static void ssp_start(struct dai *dai, int direction)
{
struct ssp_pdata *ssp = dai_get_drvdata(dai);
uint32_t sscr0 = ssp_read(dai, SSCR0);
uint32_t sspsp = ssp_read(dai, SSPSP);
uint32_t sssr = ssp_read(dai, SSSR);

spin_lock(&dai->lock);

/* enable port */
ssp_update_bits(dai, SSCR0, SSCR0_SSE, SSCR0_SSE);
ssp->state[direction] = COMP_STATE_ACTIVE;

dai_info(dai, "ssp_start()");

if (sscr0 & SSCR0_SSE)
/* disable SSP to load new configuration */
ssp_update_bits(dai, SSCR0, SSCR0_SSE, 0);

/* enable DMA */
if (direction == DAI_DIR_PLAYBACK)
ssp_update_bits(dai, SSCR1, SSCR1_TSRE, SSCR1_TSRE);
else
ssp_update_bits(dai, SSCR1, SSCR1_RSRE, SSCR1_RSRE);

/* restore ssp status */
ssp_write(dai, SSSR, sssr);
ssp_write(dai, SSPSP, sspsp);

/* enable port */
ssp_write(dai, SSCR0, sscr0 | SSCR0_SSE);
ssp->state[direction] = COMP_STATE_ACTIVE;

spin_unlock(&dai->lock);
}

Expand Down
19 changes: 15 additions & 4 deletions src/drivers/intel/ssp/ssp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,13 +688,12 @@ static int ssp_get_hw_params(struct dai *dai,
static void ssp_start(struct dai *dai, int direction)
{
struct ssp_pdata *ssp = dai_get_drvdata(dai);
uint32_t sscr0 = ssp_read(dai, SSCR0);
uint32_t sspsp = ssp_read(dai, SSPSP);
uint32_t sssr = ssp_read(dai, SSSR);

spin_lock(&dai->lock);

/* enable port */
ssp_update_bits(dai, SSCR0, SSCR0_SSE, SSCR0_SSE);
ssp->state[direction] = COMP_STATE_ACTIVE;

dai_info(dai, "ssp_start()");

if (ssp->params.bclk_delay) {
Expand All @@ -705,6 +704,10 @@ static void ssp_start(struct dai *dai, int direction)
ssp->params.bclk_delay));
}

if (sscr0 & SSCR0_SSE)
/* disable SSP to load new configuration */
ssp_update_bits(dai, SSCR0, SSCR0_SSE, 0);

/* enable DMA */
if (direction == DAI_DIR_PLAYBACK) {
ssp_update_bits(dai, SSCR1, SSCR1_TSRE, SSCR1_TSRE);
Expand All @@ -714,6 +717,14 @@ static void ssp_start(struct dai *dai, int direction)
ssp_update_bits(dai, SSRSA, SSRSA_RXEN, SSRSA_RXEN);
}

/* restore ssp status */
ssp_write(dai, SSSR, sssr);
ssp_write(dai, SSPSP, sspsp);

/* enable port */
ssp_write(dai, SSCR0, sscr0 | SSCR0_SSE);
ssp->state[direction] = COMP_STATE_ACTIVE;

/* wait to get valid fifo status */
wait_delay(PLATFORM_SSP_DELAY);

Expand Down