|
@@ -49,7 +49,6 @@ struct bf5xx_i2s_port {
|
|
|
u16 rcr1;
|
|
|
u16 tcr2;
|
|
|
u16 rcr2;
|
|
|
- int counter;
|
|
|
int configured;
|
|
|
};
|
|
|
|
|
@@ -133,16 +132,6 @@ static int bf5xx_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai,
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-static int bf5xx_i2s_startup(struct snd_pcm_substream *substream,
|
|
|
- struct snd_soc_dai *dai)
|
|
|
-{
|
|
|
- pr_debug("%s enter\n", __func__);
|
|
|
-
|
|
|
- /*this counter is used for counting how many pcm streams are opened*/
|
|
|
- bf5xx_i2s.counter++;
|
|
|
- return 0;
|
|
|
-}
|
|
|
-
|
|
|
static int bf5xx_i2s_hw_params(struct snd_pcm_substream *substream,
|
|
|
struct snd_pcm_hw_params *params,
|
|
|
struct snd_soc_dai *dai)
|
|
@@ -201,9 +190,8 @@ static void bf5xx_i2s_shutdown(struct snd_pcm_substream *substream,
|
|
|
struct snd_soc_dai *dai)
|
|
|
{
|
|
|
pr_debug("%s enter\n", __func__);
|
|
|
- bf5xx_i2s.counter--;
|
|
|
/* No active stream, SPORT is allowed to be configured again. */
|
|
|
- if (!bf5xx_i2s.counter)
|
|
|
+ if (!dai->active)
|
|
|
bf5xx_i2s.configured = 0;
|
|
|
}
|
|
|
|
|
@@ -284,7 +272,6 @@ static int bf5xx_i2s_resume(struct snd_soc_dai *dai)
|
|
|
SNDRV_PCM_FMTBIT_S32_LE)
|
|
|
|
|
|
static struct snd_soc_dai_ops bf5xx_i2s_dai_ops = {
|
|
|
- .startup = bf5xx_i2s_startup,
|
|
|
.shutdown = bf5xx_i2s_shutdown,
|
|
|
.hw_params = bf5xx_i2s_hw_params,
|
|
|
.set_fmt = bf5xx_i2s_set_dai_fmt,
|