ASoC: samsung: i2s: Let runtime PM operations to control op_clk too
authorMarek Szyprowski <m.szyprowski@samsung.com>
Thu, 29 Dec 2016 11:34:06 +0000 (12:34 +0100)
committerMark Brown <broonie@kernel.org>
Sat, 31 Dec 2016 18:36:31 +0000 (18:36 +0000)
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>
sound/soc/samsung/i2s.c

index df3fae8626658abe6d1b84f3a3993becc49db734..b2b9ee4a177a171b153a2404854b4fee8f3c6291 100644 (file)
@@ -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);