ASoC: Merge snd_soc_ops into snd_soc_dai_ops

Liam Girdwood's ASoC v2 work avoids having two different ops structures for DAIs by merging the members of struct snd_soc_ops into struct snd_soc_dai_ops, allowing per DAI configuration for everything. Backport this change. This paves the way for future work allowing any combination of DAIs to be connected rather than having fixed purpose CODEC and CPU DAIs and only allowing CODEC<->CPU interconnections. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2026-09-24 18:16:04 +00:00 · 2008-11-18 22:11:38 +00:00 · 2008-11-18 22:11:38 +00:00 · dee89c4d94
commit dee89c4d94
parent a47cbe7263
42 changed files with 265 additions and 237 deletions
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
--- a/sound/soc/atmel/atmel_ssc_dai.c
+++ b/sound/soc/atmel/atmel_ssc_dai.c
--- a/sound/soc/au1x/psc-ac97.c
+++ b/sound/soc/au1x/psc-ac97.c
--- a/sound/soc/au1x/psc-i2s.c
+++ b/sound/soc/au1x/psc-i2s.c
--- a/sound/soc/blackfin/bf5xx-i2s.c
+++ b/sound/soc/blackfin/bf5xx-i2s.c
--- a/sound/soc/codecs/ac97.c
+++ b/sound/soc/codecs/ac97.c
--- a/sound/soc/codecs/ak4535.c
+++ b/sound/soc/codecs/ak4535.c
--- a/sound/soc/codecs/cs4270.c
+++ b/sound/soc/codecs/cs4270.c
--- a/sound/soc/codecs/ssm2602.c
+++ b/sound/soc/codecs/ssm2602.c
--- a/sound/soc/codecs/tlv320aic23.c
+++ b/sound/soc/codecs/tlv320aic23.c
--- a/sound/soc/codecs/tlv320aic26.c
+++ b/sound/soc/codecs/tlv320aic26.c
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
--- a/sound/soc/codecs/uda134x.c
+++ b/sound/soc/codecs/uda134x.c
--- a/sound/soc/codecs/uda1380.c
+++ b/sound/soc/codecs/uda1380.c
--- a/sound/soc/codecs/wm8510.c
+++ b/sound/soc/codecs/wm8510.c
--- a/sound/soc/codecs/wm8580.c
+++ b/sound/soc/codecs/wm8580.c
--- a/sound/soc/codecs/wm8728.c
+++ b/sound/soc/codecs/wm8728.c
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
--- a/sound/soc/codecs/wm8750.c
+++ b/sound/soc/codecs/wm8750.c
--- a/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
--- a/sound/soc/codecs/wm8900.c
+++ b/sound/soc/codecs/wm8900.c
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
--- a/sound/soc/codecs/wm8971.c
+++ b/sound/soc/codecs/wm8971.c
--- a/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
--- a/sound/soc/codecs/wm9713.c
+++ b/sound/soc/codecs/wm9713.c
--- a/sound/soc/davinci/davinci-i2s.c
+++ b/sound/soc/davinci/davinci-i2s.c
--- a/sound/soc/davinci/davinci-sffsdr.c
+++ b/sound/soc/davinci/davinci-sffsdr.c
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
--- a/sound/soc/fsl/mpc5200_psc_i2s.c
+++ b/sound/soc/fsl/mpc5200_psc_i2s.c
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
--- a/sound/soc/omap/omap2evm.c
+++ b/sound/soc/omap/omap2evm.c
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
--- a/sound/soc/pxa/pxa2xx-ac97.c
+++ b/sound/soc/pxa/pxa2xx-ac97.c
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
--- a/sound/soc/s3c24xx/s3c2412-i2s.c
+++ b/sound/soc/s3c24xx/s3c2412-i2s.c
--- a/sound/soc/s3c24xx/s3c2443-ac97.c
+++ b/sound/soc/s3c24xx/s3c2443-ac97.c
--- a/sound/soc/s3c24xx/s3c24xx-i2s.c
+++ b/sound/soc/s3c24xx/s3c24xx-i2s.c
--- a/sound/soc/sh/hac.c
+++ b/sound/soc/sh/hac.c
--- a/sound/soc/sh/ssi.c
+++ b/sound/soc/sh/ssi.c
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c