diff options
| author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2018-02-12 17:15:34 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-02-14 12:10:12 +0000 |
| commit | 48279c53fd1d09dc0d1b6ebb9f21732c507cea0b (patch) | |
| tree | 3a24094c26df8c41ebbcc25b613e25b983c04ccc | |
| parent | aa274c5cfd13381372d2dace32b7354ccba7d2ab (diff) | |
| download | op-kernel-dev-48279c53fd1d09dc0d1b6ebb9f21732c507cea0b.zip op-kernel-dev-48279c53fd1d09dc0d1b6ebb9f21732c507cea0b.tar.gz | |
ASoC: samsung: i2s: Prevent external abort on exynos5433 I2S1 access
It seems both PCLK_I2S1 and SCLK_I2S1 clocks need to be enabled before
I2S1 control registers can be accessed on exynos5433. If SCLK clock
is disabled an exception is triggered. To fix this parent clock of
the RCLK_SRC clock is assigned to pri_dai->op_clk so required gate
clock is handled by the runtime PM ops.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Acked-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/samsung/i2s.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index 5088d12..7b57ad1 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -1404,9 +1404,14 @@ static int samsung_i2s_probe(struct platform_device *pdev) pm_runtime_enable(&pdev->dev); ret = i2s_register_clock_provider(pdev); - if (!ret) - return 0; + if (ret < 0) + goto err_disable_pm; + + pri_dai->op_clk = clk_get_parent(pri_dai->clk_table[CLK_I2S_RCLK_SRC]); + + return 0; +err_disable_pm: pm_runtime_disable(&pdev->dev); err_disable_clk: clk_disable_unprepare(pri_dai->clk); |
