Commit 852fd9e5 authored by Mark Brown's avatar Mark Brown

ASoC: Each PXA AC97 DAI needs a separate ops

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent f2a5d6a2
...@@ -164,10 +164,18 @@ static int pxa2xx_ac97_hw_mic_params(struct snd_pcm_substream *substream, ...@@ -164,10 +164,18 @@ static int pxa2xx_ac97_hw_mic_params(struct snd_pcm_substream *substream,
SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 | \ SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 | \
SNDRV_PCM_RATE_48000) SNDRV_PCM_RATE_48000)
static struct snd_soc_dai_ops pxa_ac97_dai_ops = { static struct snd_soc_dai_ops pxa_ac97_hifi_dai_ops = {
.hw_params = pxa2xx_ac97_hw_params, .hw_params = pxa2xx_ac97_hw_params,
}; };
static struct snd_soc_dai_ops pxa_ac97_aux_dai_ops = {
.hw_params = pxa2xx_ac97_hw_aux_params,
};
static struct snd_soc_dai_ops pxa_ac97_mic_dai_ops = {
.hw_params = pxa2xx_ac97_hw_mic_params,
};
/* /*
* There is only 1 physical AC97 interface for pxa2xx, but it * There is only 1 physical AC97 interface for pxa2xx, but it
* has extra fifo's that can be used for aux DACs and ADCs. * has extra fifo's that can be used for aux DACs and ADCs.
...@@ -193,7 +201,7 @@ struct snd_soc_dai pxa_ac97_dai[] = { ...@@ -193,7 +201,7 @@ struct snd_soc_dai pxa_ac97_dai[] = {
.channels_max = 2, .channels_max = 2,
.rates = PXA2XX_AC97_RATES, .rates = PXA2XX_AC97_RATES,
.formats = SNDRV_PCM_FMTBIT_S16_LE,}, .formats = SNDRV_PCM_FMTBIT_S16_LE,},
.ops = &pxa_ac97_dai_ops, .ops = &pxa_ac97_hifi_dai_ops,
}, },
{ {
.name = "pxa2xx-ac97-aux", .name = "pxa2xx-ac97-aux",
...@@ -211,7 +219,7 @@ struct snd_soc_dai pxa_ac97_dai[] = { ...@@ -211,7 +219,7 @@ struct snd_soc_dai pxa_ac97_dai[] = {
.channels_max = 1, .channels_max = 1,
.rates = PXA2XX_AC97_RATES, .rates = PXA2XX_AC97_RATES,
.formats = SNDRV_PCM_FMTBIT_S16_LE,}, .formats = SNDRV_PCM_FMTBIT_S16_LE,},
.ops = &pxa_ac97_dai_ops, .ops = &pxa_ac97_aux_dai_ops,
}, },
{ {
.name = "pxa2xx-ac97-mic", .name = "pxa2xx-ac97-mic",
...@@ -223,7 +231,7 @@ struct snd_soc_dai pxa_ac97_dai[] = { ...@@ -223,7 +231,7 @@ struct snd_soc_dai pxa_ac97_dai[] = {
.channels_max = 1, .channels_max = 1,
.rates = PXA2XX_AC97_RATES, .rates = PXA2XX_AC97_RATES,
.formats = SNDRV_PCM_FMTBIT_S16_LE,}, .formats = SNDRV_PCM_FMTBIT_S16_LE,},
.ops = &pxa_ac97_dai_ops, .ops = &pxa_ac97_mic_dai_ops,
}, },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment