aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/fsl
diff options
context:
space:
mode:
authorEric Millbrandt <emillbrandt@dekaresearch.com>2012-09-13 17:43:12 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-09-18 23:04:08 -0400
commita4f7b70dc73d611680a485150f2b11bcf23a2d01 (patch)
treeaf5ea7dcdebed406489fd7c65f0fcdfac657c69b /sound/soc/fsl
parentf515b67381de0a4a28d639e0f1bb587a3a49f0d2 (diff)
ASoC: fsl: mpc5200 add missing information to snd_soc_dai_driver
Add missing dai_driver information to avoid these runtime errors [ 16.433788] asoc: error - multiple DAI f0002c00.i2s registered with no name [ 16.453551] Failed to register DAI [ 16.461222] mpc5200-psc-i2s: probe of f0002c00.i2s failed with error -22 [ 16.475242] asoc: error - multiple DAI f0002000.ac97 registered with no name [ 16.488087] mpc5200-psc-ac97 f0002000.ac97: Failed to register DAI [ 16.502222] mpc5200-psc-ac97: probe of f0002000.ac97 failed with error -22 Signed-off-by: Eric Millbrandt <emillbrandt@dekaresearch.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/fsl')
-rw-r--r--sound/soc/fsl/mpc5200_psc_ac97.c5
-rw-r--r--sound/soc/fsl/mpc5200_psc_i2s.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/fsl/mpc5200_psc_ac97.c b/sound/soc/fsl/mpc5200_psc_ac97.c
index 9a094535fb26..a313c0ae36db 100644
--- a/sound/soc/fsl/mpc5200_psc_ac97.c
+++ b/sound/soc/fsl/mpc5200_psc_ac97.c
@@ -237,15 +237,18 @@ static const struct snd_soc_dai_ops psc_ac97_digital_ops = {
237 237
238static struct snd_soc_dai_driver psc_ac97_dai[] = { 238static struct snd_soc_dai_driver psc_ac97_dai[] = {
239{ 239{
240 .name = "mpc5200-psc-ac97.0",
240 .ac97_control = 1, 241 .ac97_control = 1,
241 .probe = psc_ac97_probe, 242 .probe = psc_ac97_probe,
242 .playback = { 243 .playback = {
244 .stream_name = "AC97 Playback",
243 .channels_min = 1, 245 .channels_min = 1,
244 .channels_max = 6, 246 .channels_max = 6,
245 .rates = SNDRV_PCM_RATE_8000_48000, 247 .rates = SNDRV_PCM_RATE_8000_48000,
246 .formats = SNDRV_PCM_FMTBIT_S32_BE, 248 .formats = SNDRV_PCM_FMTBIT_S32_BE,
247 }, 249 },
248 .capture = { 250 .capture = {
251 .stream_name = "AC97 Capture",
249 .channels_min = 1, 252 .channels_min = 1,
250 .channels_max = 2, 253 .channels_max = 2,
251 .rates = SNDRV_PCM_RATE_8000_48000, 254 .rates = SNDRV_PCM_RATE_8000_48000,
@@ -254,8 +257,10 @@ static struct snd_soc_dai_driver psc_ac97_dai[] = {
254 .ops = &psc_ac97_analog_ops, 257 .ops = &psc_ac97_analog_ops,
255}, 258},
256{ 259{
260 .name = "mpc5200-psc-ac97.1",
257 .ac97_control = 1, 261 .ac97_control = 1,
258 .playback = { 262 .playback = {
263 .stream_name = "AC97 SPDIF",
259 .channels_min = 1, 264 .channels_min = 1,
260 .channels_max = 2, 265 .channels_max = 2,
261 .rates = SNDRV_PCM_RATE_32000 | \ 266 .rates = SNDRV_PCM_RATE_32000 | \
diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c
index c0b7a23ebbfd..ba1f0a66358f 100644
--- a/sound/soc/fsl/mpc5200_psc_i2s.c
+++ b/sound/soc/fsl/mpc5200_psc_i2s.c
@@ -130,13 +130,16 @@ static const struct snd_soc_dai_ops psc_i2s_dai_ops = {
130}; 130};
131 131
132static struct snd_soc_dai_driver psc_i2s_dai[] = {{ 132static struct snd_soc_dai_driver psc_i2s_dai[] = {{
133 .name = "mpc5200-psc-i2s.0",
133 .playback = { 134 .playback = {
135 .stream_name = "I2S Playback",
134 .channels_min = 2, 136 .channels_min = 2,
135 .channels_max = 2, 137 .channels_max = 2,
136 .rates = PSC_I2S_RATES, 138 .rates = PSC_I2S_RATES,
137 .formats = PSC_I2S_FORMATS, 139 .formats = PSC_I2S_FORMATS,
138 }, 140 },
139 .capture = { 141 .capture = {
142 .stream_name = "I2S Capture",
140 .channels_min = 2, 143 .channels_min = 2,
141 .channels_max = 2, 144 .channels_max = 2,
142 .rates = PSC_I2S_RATES, 145 .rates = PSC_I2S_RATES,