Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70052413 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/asoc' into for-linus 

* topic/asoc:
  ASoC: Blackfin: update the bf5xx_i2s_resume parameters
  ASoC: Blackfin: keep better track of SPORT configuration state
parents 47166281 92a6ad34

sound/soc/blackfin/bf5xx-i2s.c

+7 −3
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ struct bf5xx_i2s_port { 
	u16 tcr2;

	u16 rcr2;

	int counter;

	int configured;

};



static struct bf5xx_i2s_port bf5xx_i2s;
@@ -168,7 +169,7 @@ static int bf5xx_i2s_hw_params(struct snd_pcm_substream *substream, 
		break;

	}



	if (bf5xx_i2s.counter == 1) {

	if (!bf5xx_i2s.configured) {

		/*

		 * TX and RX are not independent,they are enabled at the

		 * same time, even if only one side is running. So, we
@@ -177,6 +178,7 @@ static int bf5xx_i2s_hw_params(struct snd_pcm_substream *substream, 
		 *

		 * CPU DAI:slave mode.

		 */

		bf5xx_i2s.configured = 1;

		ret = sport_config_rx(sport_handle, bf5xx_i2s.rcr1,

				      bf5xx_i2s.rcr2, 0, 0);

		if (ret) {
@@ -200,6 +202,9 @@ static void bf5xx_i2s_shutdown(struct snd_pcm_substream *substream, 
{

	pr_debug("%s enter\n", __func__);

	bf5xx_i2s.counter--;

	/* No active stream, SPORT is allowed to be configured again. */

	if (!bf5xx_i2s.counter)

		bf5xx_i2s.configured = 0;

}



static int bf5xx_i2s_probe(struct platform_device *pdev,
@@ -244,8 +249,7 @@ static int bf5xx_i2s_suspend(struct snd_soc_dai *dai) 
	return 0;

}



static int bf5xx_i2s_resume(struct platform_device *pdev,

			    struct snd_soc_dai *dai)

static int bf5xx_i2s_resume(struct snd_soc_dai *dai)

{

	int ret;

	struct sport_device *sport =