Browse Source

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>
Stephen Warren 12 years ago
parent
commit
249e66c326
2 changed files with 12 additions and 1 deletions
  1. 4 0
      sound/soc/tegra/tegra30_ahub.c
  2. 8 1
      sound/soc/tegra/tegra30_i2s.c

+ 4 - 0
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;
 }

+ 8 - 1
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