Skip to content

Commit

Permalink
ASoC: switch over to use snd_soc_register_component() on kirkwood i2s
Browse files Browse the repository at this point in the history
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Mar 26, 2013
1 parent 29cc15c commit 83d85f5
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions sound/soc/kirkwood/kirkwood-i2s.c
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,10 @@ static struct snd_soc_dai_driver kirkwood_i2s_dai_extclk = {
.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)
{
struct kirkwood_asoc_platform_data *data = pdev->dev.platform_data;
Expand Down Expand Up @@ -524,10 +528,11 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev)
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)
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)) {
clk_disable_unprepare(priv->extclk);
Expand All @@ -542,7 +547,7 @@ static int kirkwood_i2s_dev_remove(struct platform_device *pdev)
{
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)) {
clk_disable_unprepare(priv->extclk);
Expand Down

0 comments on commit 83d85f5

Please sign in to comment.