hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: switch over to use snd_soc_register_component() on kirkwood i2s 

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Kuninori Morimoto 2013-03-21 03:32:39 -07:00 committed by Mark Brown
parent 29cc15cfd2
commit 83d85f53ad
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sound/soc/kirkwood/kirkwood-i2s.c
View File

@ -451,6 +451,10 @@ static struct snd_soc_dai_driver kirkwood_i2s_dai_extclk = {
.ops = &kirkwood_i2s_dai_ops, .ops = &kirkwood_i2s_dai_ops,
}; };
static const struct snd_soc_component_driver kirkwood_i2s_component = {
.name = DRV_NAME,
};
static int kirkwood_i2s_dev_probe(struct platform_device *pdev) static int kirkwood_i2s_dev_probe(struct platform_device *pdev)
{ {
struct kirkwood_asoc_platform_data *data = pdev->dev.platform_data; struct kirkwood_asoc_platform_data *data = pdev->dev.platform_data;
@ -524,10 +528,11 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev)
priv->ctl_rec |= KIRKWOOD_RECCTL_BURST_128; priv->ctl_rec |= KIRKWOOD_RECCTL_BURST_128;
} }
err = snd_soc_register_dai(&pdev->dev, soc_dai); err = snd_soc_register_component(&pdev->dev, &kirkwood_i2s_component,
soc_dai, 1);
if (!err) if (!err)
return 0; return 0;
dev_err(&pdev->dev, "snd_soc_register_dai failed\n"); dev_err(&pdev->dev, "snd_soc_register_component failed\n");
if (!IS_ERR(priv->extclk)) { if (!IS_ERR(priv->extclk)) {
clk_disable_unprepare(priv->extclk); clk_disable_unprepare(priv->extclk);
@ -542,7 +547,7 @@ static int kirkwood_i2s_dev_remove(struct platform_device *pdev)
{ {
struct kirkwood_dma_data *priv = dev_get_drvdata(&pdev->dev); struct kirkwood_dma_data *priv = dev_get_drvdata(&pdev->dev);
snd_soc_unregister_dai(&pdev->dev); snd_soc_unregister_component(&pdev->dev);
if (!IS_ERR(priv->extclk)) { if (!IS_ERR(priv->extclk)) {
clk_disable_unprepare(priv->extclk); clk_disable_unprepare(priv->extclk);