diff options
| author | Mark Brown <broonie@kernel.org> | 2018-03-28 10:26:25 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-03-28 10:26:25 +0800 |
| commit | 78a1287b35dae35d908551830ff192e88e6bd670 (patch) | |
| tree | 6564bca8e86ee1a037a3c0565f7d65d9612b8c5e /sound | |
| parent | 91898117e66960e061b4409d0711d4e8a9a99c7c (diff) | |
| parent | d5e90bad6faa0ea93a14f88aaae62fb58e968a0a (diff) | |
| download | linux-78a1287b35dae35d908551830ff192e88e6bd670.tar.bz2 | |
Merge remote-tracking branch 'asoc/topic/pcm5102a' into asoc-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/pcm5102a.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/sound/soc/codecs/pcm5102a.c b/sound/soc/codecs/pcm5102a.c index 8ba322a00363..39ac2857a554 100644 --- a/sound/soc/codecs/pcm5102a.c +++ b/sound/soc/codecs/pcm5102a.c @@ -32,20 +32,19 @@ static struct snd_soc_dai_driver pcm5102a_dai = { }, }; -static struct snd_soc_codec_driver soc_codec_dev_pcm5102a; +static struct snd_soc_component_driver soc_component_dev_pcm5102a = { + .idle_bias_on = 1, + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, +}; static int pcm5102a_probe(struct platform_device *pdev) { - return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_pcm5102a, + return devm_snd_soc_register_component(&pdev->dev, &soc_component_dev_pcm5102a, &pcm5102a_dai, 1); } -static int pcm5102a_remove(struct platform_device *pdev) -{ - snd_soc_unregister_codec(&pdev->dev); - return 0; -} - static const struct of_device_id pcm5102a_of_match[] = { { .compatible = "ti,pcm5102a", }, { } @@ -54,7 +53,6 @@ MODULE_DEVICE_TABLE(of, pcm5102a_of_match); static struct platform_driver pcm5102a_codec_driver = { .probe = pcm5102a_probe, - .remove = pcm5102a_remove, .driver = { .name = "pcm5102a-codec", .of_match_table = pcm5102a_of_match, |