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>

diff --git a/sound/soc/fsl/mpc5200_psc_ac97.c b/sound/soc/fsl/mpc5200_psc_ac97.c
index 9a094535fb2633caf5f506dfe456435fb7dc1951..a313c0ae36dba38f5bd0abbb002f5072c72ec259 100644 (file)
--- 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 = {
 
 static struct snd_soc_dai_driver psc_ac97_dai[] = {
 {
+       .name = "mpc5200-psc-ac97.0",
        .ac97_control = 1,
        .probe  = psc_ac97_probe,
        .playback = {
+               .stream_name    = "AC97 Playback",
                .channels_min   = 1,
                .channels_max   = 6,
                .rates          = SNDRV_PCM_RATE_8000_48000,
                .formats = SNDRV_PCM_FMTBIT_S32_BE,
        },
        .capture = {
+               .stream_name    = "AC97 Capture",
                .channels_min   = 1,
                .channels_max   = 2,
                .rates          = SNDRV_PCM_RATE_8000_48000,
@@ -254,8 +257,10 @@ static struct snd_soc_dai_driver psc_ac97_dai[] = {
        .ops = &psc_ac97_analog_ops,
 },
 {
+       .name = "mpc5200-psc-ac97.1",
        .ac97_control = 1,
        .playback = {
+               .stream_name    = "AC97 SPDIF",
                .channels_min   = 1,
                .channels_max   = 2,
                .rates          = SNDRV_PCM_RATE_32000 | \

diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c
index c0b7a23ebbfd048632dc66f2ce729d9d5eccde20..ba1f0a66358f30288c6de2bf4fcba4e7468dd952 100644 (file)
--- 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 = {
 };
 
 static struct snd_soc_dai_driver psc_i2s_dai[] = {{
+       .name = "mpc5200-psc-i2s.0",
        .playback = {
+               .stream_name = "I2S Playback",
                .channels_min = 2,
                .channels_max = 2,
                .rates = PSC_I2S_RATES,
                .formats = PSC_I2S_FORMATS,
        },
        .capture = {
+               .stream_name = "I2S Capture",
                .channels_min = 2,
                .channels_max = 2,
                .rates = PSC_I2S_RATES,