aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/pxa/pxa2xx-ac97.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2008-11-24 13:01:05 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2008-11-24 13:01:31 -0500
commit3ba9e10a6d3b6abf5f5952572cff8f8d5a35ae54 (patch)
tree855569d0aeee6fc06a35928f3b6e351918c9bea6 /sound/soc/pxa/pxa2xx-ac97.c
parentb0bd53a7399f65e2d1b37cd44c5003e55b886c1e (diff)
ASoC: Remove DAI type information
DAI type information is only ever used within ASoC in order to special case AC97 and for diagnostic purposes. Since modern CPUs and codecs support multi function DAIs which can be configured for several modes it is more trouble than it's worth to maintain anything other than a flag identifying AC97 DAIs so remove the type field and replace it with an ac97_control flag. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/pxa/pxa2xx-ac97.c')
-rw-r--r--sound/soc/pxa/pxa2xx-ac97.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c
index 86667d2f1b75..bffbe288634c 100644
--- a/sound/soc/pxa/pxa2xx-ac97.c
+++ b/sound/soc/pxa/pxa2xx-ac97.c
@@ -173,7 +173,7 @@ struct snd_soc_dai pxa_ac97_dai[] = {
173{ 173{
174 .name = "pxa2xx-ac97", 174 .name = "pxa2xx-ac97",
175 .id = 0, 175 .id = 0,
176 .type = SND_SOC_DAI_AC97, 176 .ac97_control = 1,
177 .probe = pxa2xx_ac97_probe, 177 .probe = pxa2xx_ac97_probe,
178 .remove = pxa2xx_ac97_remove, 178 .remove = pxa2xx_ac97_remove,
179 .suspend = pxa2xx_ac97_suspend, 179 .suspend = pxa2xx_ac97_suspend,
@@ -196,7 +196,7 @@ struct snd_soc_dai pxa_ac97_dai[] = {
196{ 196{
197 .name = "pxa2xx-ac97-aux", 197 .name = "pxa2xx-ac97-aux",
198 .id = 1, 198 .id = 1,
199 .type = SND_SOC_DAI_AC97, 199 .ac97_control = 1,
200 .playback = { 200 .playback = {
201 .stream_name = "AC97 Aux Playback", 201 .stream_name = "AC97 Aux Playback",
202 .channels_min = 1, 202 .channels_min = 1,
@@ -215,7 +215,7 @@ struct snd_soc_dai pxa_ac97_dai[] = {
215{ 215{
216 .name = "pxa2xx-ac97-mic", 216 .name = "pxa2xx-ac97-mic",
217 .id = 2, 217 .id = 2,
218 .type = SND_SOC_DAI_AC97, 218 .ac97_control = 1,
219 .capture = { 219 .capture = {
220 .stream_name = "AC97 Mic Capture", 220 .stream_name = "AC97 Mic Capture",
221 .channels_min = 1, 221 .channels_min = 1,