Commit a4f7b70d authored by Eric Millbrandt's avatar Eric Millbrandt Committed by Mark Brown
Browse files

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: default avatarEric Millbrandt <emillbrandt@dekaresearch.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent f515b673

sound/soc/fsl/mpc5200_psc_ac97.c

+5 −0
Original line number Diff line number Diff line
@@ -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 | \

sound/soc/fsl/mpc5200_psc_i2s.c

+3 −0
Original line number Diff line number Diff line
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE