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>

2 files changed, 12 insertions, 1 deletions

diff --git a/sound/soc/tegra/tegra30_ahub.c b/sound/soc/tegra/tegra30_ahub.c
index 0f4787c24e43..d554d46d08b5 100644
--- 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 bd0ebc09c8be..d04146cad61f 100644
--- 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