Commit cd5e4d0b authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

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

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 425f3708
...@@ -436,6 +436,10 @@ static struct snd_soc_dai_driver s6000_i2s_dai = { ...@@ -436,6 +436,10 @@ static struct snd_soc_dai_driver s6000_i2s_dai = {
.ops = &s6000_i2s_dai_ops, .ops = &s6000_i2s_dai_ops,
}; };
static const struct snd_soc_component_driver s6000_i2s_component = {
.name = "s6000-i2s",
};
static int s6000_i2s_probe(struct platform_device *pdev) static int s6000_i2s_probe(struct platform_device *pdev)
{ {
struct s6000_i2s_dev *dev; struct s6000_i2s_dev *dev;
...@@ -543,7 +547,8 @@ static int s6000_i2s_probe(struct platform_device *pdev) ...@@ -543,7 +547,8 @@ static int s6000_i2s_probe(struct platform_device *pdev)
S6_I2S_INT_UNDERRUN | S6_I2S_INT_UNDERRUN |
S6_I2S_INT_OVERRUN); S6_I2S_INT_OVERRUN);
ret = snd_soc_register_dai(&pdev->dev, &s6000_i2s_dai); ret = snd_soc_register_component(&pdev->dev, &s6000_i2s_component,
&s6000_i2s_dai, 1);
if (ret) if (ret)
goto err_release_dev; goto err_release_dev;
...@@ -572,7 +577,7 @@ static void s6000_i2s_remove(struct platform_device *pdev) ...@@ -572,7 +577,7 @@ static void s6000_i2s_remove(struct platform_device *pdev)
struct resource *region; struct resource *region;
void __iomem *mmio = dev->scbbase; void __iomem *mmio = dev->scbbase;
snd_soc_unregister_dai(&pdev->dev); snd_soc_unregister_component(&pdev->dev);
s6000_i2s_stop_channel(dev, 0); s6000_i2s_stop_channel(dev, 0);
s6000_i2s_stop_channel(dev, 1); s6000_i2s_stop_channel(dev, 1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment