ASoC: tegra: add runtime PM to resume functions

Tegra HW needs clocks etc. active when touching registers. Make sure they
are active during resume, by calling pm_runtime_get_sync() before touching
HW.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/sound/soc/tegra/tegra30_ahub.c b/sound/soc/tegra/tegra30_ahub.c
index 0f4787c24e43e67bddcf9c3bbee8c4b551e5823c..d554d46d08b550788a1bd0ad706f8ed7948a318a 100644 (file)
--- a/sound/soc/tegra/tegra30_ahub.c
+++ b/sound/soc/tegra/tegra30_ahub.c
@@ -640,8 +640,12 @@ static int tegra30_ahub_resume(struct device *dev)
 {
        int ret;
 
+       ret = pm_runtime_get_sync(dev);
+       if (ret < 0)
+               return ret;
        ret = regcache_sync(ahub->regmap_ahub);
        ret |= regcache_sync(ahub->regmap_apbif);
+       pm_runtime_put(dev);
 
        return ret;
 }

diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c
index bd0ebc09c8be76f743561387379dffb278505322..d04146cad61f4f2dd0227815d0f25970e22e4cae 100644 (file)
--- a/sound/soc/tegra/tegra30_i2s.c
+++ b/sound/soc/tegra/tegra30_i2s.c
@@ -527,8 +527,15 @@ static int tegra30_i2s_suspend(struct device *dev)
 static int tegra30_i2s_resume(struct device *dev)
 {
        struct tegra30_i2s *i2s = dev_get_drvdata(dev);
+       int ret;
 
-       return regcache_sync(i2s->regmap);
+       ret = pm_runtime_get_sync(dev);
+       if (ret < 0)
+               return ret;
+       ret = regcache_sync(i2s->regmap);
+       pm_runtime_put(dev);
+
+       return ret;
 }
 #endif