diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2013-03-21 06:29:24 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-26 17:55:23 -0400 |
commit | 4edf87f5f7984812ce7dfb5320f198e91e60bb9c (patch) | |
tree | 62a84b63a9e4c3b483a43cf423121fa1bf14482c | |
parent | a4ff200c00f836f6d0c4d9ac954596b5df40d157 (diff) |
ASoC: switch over to use snd_soc_register_component() on au1x psc-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/au1x/psc-i2s.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sound/soc/au1x/psc-i2s.c b/sound/soc/au1x/psc-i2s.c index 360b4e50d7c8..fe923a7bdc39 100644 --- a/sound/soc/au1x/psc-i2s.c +++ b/sound/soc/au1x/psc-i2s.c | |||
@@ -288,6 +288,10 @@ static const struct snd_soc_dai_driver au1xpsc_i2s_dai_template = { | |||
288 | .ops = &au1xpsc_i2s_dai_ops, | 288 | .ops = &au1xpsc_i2s_dai_ops, |
289 | }; | 289 | }; |
290 | 290 | ||
291 | static const struct snd_soc_component_driver au1xpsc_i2s_component = { | ||
292 | .name = "au1xpsc-i2s", | ||
293 | }; | ||
294 | |||
291 | static int au1xpsc_i2s_drvprobe(struct platform_device *pdev) | 295 | static int au1xpsc_i2s_drvprobe(struct platform_device *pdev) |
292 | { | 296 | { |
293 | struct resource *iores, *dmares; | 297 | struct resource *iores, *dmares; |
@@ -350,14 +354,15 @@ static int au1xpsc_i2s_drvprobe(struct platform_device *pdev) | |||
350 | 354 | ||
351 | platform_set_drvdata(pdev, wd); | 355 | platform_set_drvdata(pdev, wd); |
352 | 356 | ||
353 | return snd_soc_register_dai(&pdev->dev, &wd->dai_drv); | 357 | return snd_soc_register_component(&pdev->dev, &au1xpsc_i2s_component, |
358 | &wd->dai_drv, 1); | ||
354 | } | 359 | } |
355 | 360 | ||
356 | static int au1xpsc_i2s_drvremove(struct platform_device *pdev) | 361 | static int au1xpsc_i2s_drvremove(struct platform_device *pdev) |
357 | { | 362 | { |
358 | struct au1xpsc_audio_data *wd = platform_get_drvdata(pdev); | 363 | struct au1xpsc_audio_data *wd = platform_get_drvdata(pdev); |
359 | 364 | ||
360 | snd_soc_unregister_dai(&pdev->dev); | 365 | snd_soc_unregister_component(&pdev->dev); |
361 | 366 | ||
362 | au_writel(0, I2S_CFG(wd)); | 367 | au_writel(0, I2S_CFG(wd)); |
363 | au_sync(); | 368 | au_sync(); |