diff options
Diffstat (limited to 'sound/soc/dwc/designware_i2s.c')
-rw-r--r-- | sound/soc/dwc/designware_i2s.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c index deb30d59965e..593a3ea12d4c 100644 --- a/sound/soc/dwc/designware_i2s.c +++ b/sound/soc/dwc/designware_i2s.c | |||
@@ -297,6 +297,10 @@ static struct snd_soc_dai_ops dw_i2s_dai_ops = { | |||
297 | .trigger = dw_i2s_trigger, | 297 | .trigger = dw_i2s_trigger, |
298 | }; | 298 | }; |
299 | 299 | ||
300 | static const struct snd_soc_component_driver dw_i2s_component = { | ||
301 | .name = "dw-i2s", | ||
302 | }; | ||
303 | |||
300 | #ifdef CONFIG_PM | 304 | #ifdef CONFIG_PM |
301 | 305 | ||
302 | static int dw_i2s_suspend(struct snd_soc_dai *dai) | 306 | static int dw_i2s_suspend(struct snd_soc_dai *dai) |
@@ -413,7 +417,8 @@ static int dw_i2s_probe(struct platform_device *pdev) | |||
413 | 417 | ||
414 | dev->dev = &pdev->dev; | 418 | dev->dev = &pdev->dev; |
415 | dev_set_drvdata(&pdev->dev, dev); | 419 | dev_set_drvdata(&pdev->dev, dev); |
416 | ret = snd_soc_register_dai(&pdev->dev, dw_i2s_dai); | 420 | ret = snd_soc_register_component(&pdev->dev, &dw_i2s_component, |
421 | dw_i2s_dai, 1); | ||
417 | if (ret != 0) { | 422 | if (ret != 0) { |
418 | dev_err(&pdev->dev, "not able to register dai\n"); | 423 | dev_err(&pdev->dev, "not able to register dai\n"); |
419 | goto err_set_drvdata; | 424 | goto err_set_drvdata; |
@@ -434,7 +439,7 @@ static int dw_i2s_remove(struct platform_device *pdev) | |||
434 | { | 439 | { |
435 | struct dw_i2s_dev *dev = dev_get_drvdata(&pdev->dev); | 440 | struct dw_i2s_dev *dev = dev_get_drvdata(&pdev->dev); |
436 | 441 | ||
437 | snd_soc_unregister_dai(&pdev->dev); | 442 | snd_soc_unregister_component(&pdev->dev); |
438 | dev_set_drvdata(&pdev->dev, NULL); | 443 | dev_set_drvdata(&pdev->dev, NULL); |
439 | 444 | ||
440 | clk_put(dev->clk); | 445 | clk_put(dev->clk); |