diff options
| author | Mark Brown <broonie@kernel.org> | 2018-12-18 13:23:57 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-12-18 13:23:57 +0100 |
| commit | c5fd9e77be44360b4827069c59f524815517917b (patch) | |
| tree | d57b2bc6f56c08e8d974423715eb03c7da29ad20 /sound/soc/codecs | |
| parent | Linux 4.20-rc7 (diff) | |
| parent | ASoC: rt5660: Add a new ACPI match ID (diff) | |
| download | linux-c5fd9e77be44360b4827069c59f524815517917b.tar.xz linux-c5fd9e77be44360b4827069c59f524815517917b.zip | |
Merge branch 'asoc-4.20' into asoc-linus
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/pcm3168a.c | 18 | ||||
| -rw-r--r-- | sound/soc/codecs/rt5660.c | 1 |
2 files changed, 12 insertions, 7 deletions
diff --git a/sound/soc/codecs/pcm3168a.c b/sound/soc/codecs/pcm3168a.c index 52cc950c9fd1..445d025e1409 100644 --- a/sound/soc/codecs/pcm3168a.c +++ b/sound/soc/codecs/pcm3168a.c @@ -770,15 +770,22 @@ err_clk: } EXPORT_SYMBOL_GPL(pcm3168a_probe); -void pcm3168a_remove(struct device *dev) +static void pcm3168a_disable(struct device *dev) { struct pcm3168a_priv *pcm3168a = dev_get_drvdata(dev); - pm_runtime_disable(dev); regulator_bulk_disable(ARRAY_SIZE(pcm3168a->supplies), - pcm3168a->supplies); + pcm3168a->supplies); clk_disable_unprepare(pcm3168a->scki); } + +void pcm3168a_remove(struct device *dev) +{ + pm_runtime_disable(dev); +#ifndef CONFIG_PM + pcm3168a_disable(dev); +#endif +} EXPORT_SYMBOL_GPL(pcm3168a_remove); #ifdef CONFIG_PM @@ -833,10 +840,7 @@ static int pcm3168a_rt_suspend(struct device *dev) regcache_cache_only(pcm3168a->regmap, true); - regulator_bulk_disable(ARRAY_SIZE(pcm3168a->supplies), - pcm3168a->supplies); - - clk_disable_unprepare(pcm3168a->scki); + pcm3168a_disable(dev); return 0; } diff --git a/sound/soc/codecs/rt5660.c b/sound/soc/codecs/rt5660.c index 27f7445b2432..e74b2e8cd423 100644 --- a/sound/soc/codecs/rt5660.c +++ b/sound/soc/codecs/rt5660.c @@ -1246,6 +1246,7 @@ MODULE_DEVICE_TABLE(of, rt5660_of_match); static const struct acpi_device_id rt5660_acpi_match[] = { { "10EC5660", 0 }, + { "10EC3277", 0 }, { }, }; MODULE_DEVICE_TABLE(acpi, rt5660_acpi_match); |