diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2013-03-21 06:31:53 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-26 17:55:26 -0400 |
commit | f200c02beb5ddf4d886b4aca53f9f9f8bf332d06 (patch) | |
tree | 6ac174c3e6a13ef43e1964fe32bc05d06e07e0cd | |
parent | ec05085170fcac5cba66306155083f120dec6ff6 (diff) |
ASoC: switch over to use snd_soc_register_component() on mpc5200 i2s
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | sound/soc/fsl/mpc5200_psc_i2s.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c index b95b966f25a0..f4efaadb80a2 100644 --- a/sound/soc/fsl/mpc5200_psc_i2s.c +++ b/sound/soc/fsl/mpc5200_psc_i2s.c | |||
@@ -148,6 +148,10 @@ static struct snd_soc_dai_driver psc_i2s_dai[] = {{ | |||
148 | .ops = &psc_i2s_dai_ops, | 148 | .ops = &psc_i2s_dai_ops, |
149 | } }; | 149 | } }; |
150 | 150 | ||
151 | static const struct snd_soc_component_driver psc_i2s_component = { | ||
152 | .name = "mpc5200-i2s", | ||
153 | }; | ||
154 | |||
151 | /* --------------------------------------------------------------------- | 155 | /* --------------------------------------------------------------------- |
152 | * OF platform bus binding code: | 156 | * OF platform bus binding code: |
153 | * - Probe/remove operations | 157 | * - Probe/remove operations |
@@ -163,7 +167,8 @@ static int psc_i2s_of_probe(struct platform_device *op) | |||
163 | if (rc != 0) | 167 | if (rc != 0) |
164 | return rc; | 168 | return rc; |
165 | 169 | ||
166 | rc = snd_soc_register_dais(&op->dev, psc_i2s_dai, ARRAY_SIZE(psc_i2s_dai)); | 170 | rc = snd_soc_register_component(&op->dev, &psc_i2s_component, |
171 | psc_i2s_dai, ARRAY_SIZE(psc_i2s_dai)); | ||
167 | if (rc != 0) { | 172 | if (rc != 0) { |
168 | pr_err("Failed to register DAI\n"); | 173 | pr_err("Failed to register DAI\n"); |
169 | return rc; | 174 | return rc; |
@@ -208,7 +213,7 @@ static int psc_i2s_of_probe(struct platform_device *op) | |||
208 | static int psc_i2s_of_remove(struct platform_device *op) | 213 | static int psc_i2s_of_remove(struct platform_device *op) |
209 | { | 214 | { |
210 | mpc5200_audio_dma_destroy(op); | 215 | mpc5200_audio_dma_destroy(op); |
211 | snd_soc_unregister_dais(&op->dev, ARRAY_SIZE(psc_i2s_dai)); | 216 | snd_soc_unregister_component(&op->dev); |
212 | return 0; | 217 | return 0; |
213 | } | 218 | } |
214 | 219 | ||