diff options
| author | Marek Szyprowski | 2016-12-29 12:34:06 +0100 |
|---|---|---|
| committer | Mark Brown | 2016-12-31 19:36:31 +0100 |
| commit | afa99da863e8e00efd8ce2f8840ed31d50abb889 (patch) | |
| tree | 632745e6d92e23a222dcdd6e58321ce2475641e0 /sound/soc | |
| parent | ASoC: samsung: i2s: Move saving and restoring regs to runtime pm operations (diff) | |
| download | kernel-qcow2-linux-afa99da863e8e00efd8ce2f8840ed31d50abb889.tar.gz kernel-qcow2-linux-afa99da863e8e00efd8ce2f8840ed31d50abb889.tar.xz kernel-qcow2-linux-afa99da863e8e00efd8ce2f8840ed31d50abb889.zip | |
ASoC: samsung: i2s: Let runtime PM operations to control op_clk too
This patch adds handling of parent operational clock to runtime PM
callbacks. This way it is ensured that when I2S module is in runtime
suspended state, all its parent clocks are disabled and unprepared.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/samsung/i2s.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index df3fae862665..b2b9ee4a177a 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -546,6 +546,7 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai, if (WARN_ON(IS_ERR(i2s->op_clk))) { ret = PTR_ERR(i2s->op_clk); + i2s->op_clk = NULL; goto err; } @@ -1121,6 +1122,8 @@ static int i2s_runtime_suspend(struct device *dev) i2s->suspend_i2scon = readl(i2s->addr + I2SCON); i2s->suspend_i2spsr = readl(i2s->addr + I2SPSR); + if (i2s->op_clk) + clk_disable_unprepare(i2s->op_clk); clk_disable_unprepare(i2s->clk); return 0; @@ -1131,6 +1134,8 @@ static int i2s_runtime_resume(struct device *dev) struct i2s_dai *i2s = dev_get_drvdata(dev); clk_prepare_enable(i2s->clk); + if (i2s->op_clk) + clk_prepare_enable(i2s->op_clk); writel(i2s->suspend_i2scon, i2s->addr + I2SCON); writel(i2s->suspend_i2smod, i2s->addr + I2SMOD); |