diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-07-01 08:27:25 (GMT) |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-07-01 08:27:25 (GMT) |
commit | bc32134c0523c60989d2f2439e176601668a62a5 (patch) | |
tree | 03f63fc387e78592968a1f04ee4e173ca32fec20 /sound/soc/tegra/tegra30_i2s.c | |
parent | 1c6770a38a6652777b9d1592b66e0d8e7dfb6160 (diff) | |
parent | 066624c6a1733a72a67f1d06d35a2153e7d9082b (diff) | |
download | linux-fsl-qoriq-bc32134c0523c60989d2f2439e176601668a62a5.tar.xz |
Merge branch 'for-next' into for-linus
Merge the whole changes for 3.11-rc1 merge
Diffstat (limited to 'sound/soc/tegra/tegra30_i2s.c')
-rw-r--r-- | sound/soc/tegra/tegra30_i2s.c | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c index 31d092d..d04146c 100644 --- a/sound/soc/tegra/tegra30_i2s.c +++ b/sound/soc/tegra/tegra30_i2s.c @@ -514,6 +514,31 @@ static int tegra30_i2s_platform_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM_SLEEP +static int tegra30_i2s_suspend(struct device *dev) +{ + struct tegra30_i2s *i2s = dev_get_drvdata(dev); + + regcache_mark_dirty(i2s->regmap); + + return 0; +} + +static int tegra30_i2s_resume(struct device *dev) +{ + struct tegra30_i2s *i2s = dev_get_drvdata(dev); + int ret; + + ret = pm_runtime_get_sync(dev); + if (ret < 0) + return ret; + ret = regcache_sync(i2s->regmap); + pm_runtime_put(dev); + + return ret; +} +#endif + static const struct of_device_id tegra30_i2s_of_match[] = { { .compatible = "nvidia,tegra30-i2s", }, {}, @@ -522,6 +547,7 @@ static const struct of_device_id tegra30_i2s_of_match[] = { static const struct dev_pm_ops tegra30_i2s_pm_ops = { SET_RUNTIME_PM_OPS(tegra30_i2s_runtime_suspend, tegra30_i2s_runtime_resume, NULL) + SET_SYSTEM_SLEEP_PM_OPS(tegra30_i2s_suspend, tegra30_i2s_resume) }; static struct platform_driver tegra30_i2s_driver = { |