diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2013-03-21 06:32:28 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-26 17:57:12 -0400 |
commit | 29cc15cfd2db4045d1c89d867d05bce6db76037e (patch) | |
tree | b938375c7456c9b6dd0758463e6c10f9def618a3 | |
parent | c22fd5ef0fcccc8e960f307893fc5b3de68512d7 (diff) |
ASoC: switch over to use snd_soc_register_component() on jz4740 i2s
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | sound/soc/jz4740/jz4740-i2s.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c index 6cef491f4823..9a126441c5f3 100644 --- a/sound/soc/jz4740/jz4740-i2s.c +++ b/sound/soc/jz4740/jz4740-i2s.c | |||
@@ -425,6 +425,10 @@ static struct snd_soc_dai_driver jz4740_i2s_dai = { | |||
425 | .resume = jz4740_i2s_resume, | 425 | .resume = jz4740_i2s_resume, |
426 | }; | 426 | }; |
427 | 427 | ||
428 | static const struct snd_soc_component_driver jz4740_i2s_component = { | ||
429 | .name = "jz4740-i2s", | ||
430 | }; | ||
431 | |||
428 | static int jz4740_i2s_dev_probe(struct platform_device *pdev) | 432 | static int jz4740_i2s_dev_probe(struct platform_device *pdev) |
429 | { | 433 | { |
430 | struct jz4740_i2s *i2s; | 434 | struct jz4740_i2s *i2s; |
@@ -469,7 +473,8 @@ static int jz4740_i2s_dev_probe(struct platform_device *pdev) | |||
469 | } | 473 | } |
470 | 474 | ||
471 | platform_set_drvdata(pdev, i2s); | 475 | platform_set_drvdata(pdev, i2s); |
472 | ret = snd_soc_register_dai(&pdev->dev, &jz4740_i2s_dai); | 476 | ret = snd_soc_register_component(&pdev->dev, &jz4740_i2s_component, |
477 | &jz4740_i2s_dai, 1); | ||
473 | 478 | ||
474 | if (ret) { | 479 | if (ret) { |
475 | dev_err(&pdev->dev, "Failed to register DAI\n"); | 480 | dev_err(&pdev->dev, "Failed to register DAI\n"); |
@@ -496,7 +501,7 @@ static int jz4740_i2s_dev_remove(struct platform_device *pdev) | |||
496 | { | 501 | { |
497 | struct jz4740_i2s *i2s = platform_get_drvdata(pdev); | 502 | struct jz4740_i2s *i2s = platform_get_drvdata(pdev); |
498 | 503 | ||
499 | snd_soc_unregister_dai(&pdev->dev); | 504 | snd_soc_unregister_component(&pdev->dev); |
500 | 505 | ||
501 | clk_put(i2s->clk_i2s); | 506 | clk_put(i2s->clk_i2s); |
502 | clk_put(i2s->clk_aic); | 507 | clk_put(i2s->clk_aic); |