aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/blackfin
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/blackfin
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/blackfin')
-rw-r--r--sound/soc/blackfin/bf5xx-ac97.c2
-rw-r--r--sound/soc/blackfin/bf5xx-i2s.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/blackfin/bf5xx-ac97.c b/sound/soc/blackfin/bf5xx-ac97.c
index 5dcd3f665ab1..709bdf08e398 100644
--- a/sound/soc/blackfin/bf5xx-ac97.c
+++ b/sound/soc/blackfin/bf5xx-ac97.c
@@ -409,7 +409,7 @@ static void bf5xx_ac97_remove(struct platform_device *pdev,
409struct snd_soc_dai bfin_ac97_dai = { 409struct snd_soc_dai bfin_ac97_dai = {
410 .name = "bf5xx-ac97", 410 .name = "bf5xx-ac97",
411 .id = 0, 411 .id = 0,
412 .type = SND_SOC_DAI_AC97, 412 .ac97_control = 1,
413 .probe = bf5xx_ac97_probe, 413 .probe = bf5xx_ac97_probe,
414 .remove = bf5xx_ac97_remove, 414 .remove = bf5xx_ac97_remove,
415 .suspend = bf5xx_ac97_suspend, 415 .suspend = bf5xx_ac97_suspend,
diff --git a/sound/soc/blackfin/bf5xx-i2s.c b/sound/soc/blackfin/bf5xx-i2s.c
index 4e675b55b182..6e5036bf9245 100644
--- a/sound/soc/blackfin/bf5xx-i2s.c
+++ b/sound/soc/blackfin/bf5xx-i2s.c
@@ -292,7 +292,6 @@ static int bf5xx_i2s_resume(struct platform_device *pdev,
292struct snd_soc_dai bf5xx_i2s_dai = { 292struct snd_soc_dai bf5xx_i2s_dai = {
293 .name = "bf5xx-i2s", 293 .name = "bf5xx-i2s",
294 .id = 0, 294 .id = 0,
295 .type = SND_SOC_DAI_I2S,
296 .probe = bf5xx_i2s_probe, 295 .probe = bf5xx_i2s_probe,
297 .remove = bf5xx_i2s_remove, 296 .remove = bf5xx_i2s_remove,
298 .suspend = bf5xx_i2s_suspend, 297 .suspend = bf5xx_i2s_suspend,