Commit 81bcbf2c authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mark Brown

ASoC: samsung: i2s: Move registers cache to common driver data structure

There is no need to keep the PM suspend/resume register cache separate
for each DAI as those registers are common, move related i2s_dai data
structure to the driver's common data structure.  This will allow us
to simplify the code a little eventually and to make it easier to follow.
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Acked-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3b0fa51f
...@@ -86,9 +86,6 @@ struct i2s_dai { ...@@ -86,9 +86,6 @@ struct i2s_dai {
struct snd_dmaengine_dai_dma_data idma_playback; struct snd_dmaengine_dai_dma_data idma_playback;
dma_filter_fn filter; dma_filter_fn filter;
u32 quirks; u32 quirks;
u32 suspend_i2smod;
u32 suspend_i2scon;
u32 suspend_i2spsr;
const struct samsung_i2s_variant_regs *variant_regs; const struct samsung_i2s_variant_regs *variant_regs;
spinlock_t *lock; spinlock_t *lock;
...@@ -120,6 +117,11 @@ struct samsung_i2s_priv { ...@@ -120,6 +117,11 @@ struct samsung_i2s_priv {
/* Rate of RCLK source clock */ /* Rate of RCLK source clock */
unsigned long rclk_srcrate; unsigned long rclk_srcrate;
/* Cache of selected I2S registers for system suspend */
u32 suspend_i2smod;
u32 suspend_i2scon;
u32 suspend_i2spsr;
/* The clock provider's data */ /* The clock provider's data */
struct clk *clk_table[3]; struct clk *clk_table[3];
struct clk_onecell_data clk_data; struct clk_onecell_data clk_data;
...@@ -1205,9 +1207,9 @@ static int i2s_runtime_suspend(struct device *dev) ...@@ -1205,9 +1207,9 @@ static int i2s_runtime_suspend(struct device *dev)
struct samsung_i2s_priv *priv = dev_get_drvdata(dev); struct samsung_i2s_priv *priv = dev_get_drvdata(dev);
struct i2s_dai *i2s = samsung_i2s_get_pri_dai(dev); struct i2s_dai *i2s = samsung_i2s_get_pri_dai(dev);
i2s->suspend_i2smod = readl(i2s->addr + I2SMOD); priv->suspend_i2smod = readl(i2s->addr + I2SMOD);
i2s->suspend_i2scon = readl(i2s->addr + I2SCON); priv->suspend_i2scon = readl(i2s->addr + I2SCON);
i2s->suspend_i2spsr = readl(i2s->addr + I2SPSR); priv->suspend_i2spsr = readl(i2s->addr + I2SPSR);
if (priv->op_clk) if (priv->op_clk)
clk_disable_unprepare(priv->op_clk); clk_disable_unprepare(priv->op_clk);
...@@ -1234,9 +1236,9 @@ static int i2s_runtime_resume(struct device *dev) ...@@ -1234,9 +1236,9 @@ static int i2s_runtime_resume(struct device *dev)
} }
} }
writel(i2s->suspend_i2scon, i2s->addr + I2SCON); writel(priv->suspend_i2scon, i2s->addr + I2SCON);
writel(i2s->suspend_i2smod, i2s->addr + I2SMOD); writel(priv->suspend_i2smod, i2s->addr + I2SMOD);
writel(i2s->suspend_i2spsr, i2s->addr + I2SPSR); writel(priv->suspend_i2spsr, i2s->addr + I2SPSR);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment