Commit 02c9ec11 authored by Sapthagiri Baratam's avatar Sapthagiri Baratam Committed by Greg Kroah-Hartman

mfd: arizona: Correct calling of runtime_put_sync

[ Upstream commit 6b269a41 ]

Don't call runtime_put_sync when clk32k_ref is ARIZONA_32KZ_MCLK2
as there is no corresponding runtime_get_sync call.

MCLK1 is not in the AoD power domain so if it is used as 32kHz clock
source we need to hold a runtime PM reference to keep the device from
going into low power mode.

Fixes: cdd8da8c ("mfd: arizona: Add gating of external MCLKn clocks")
Signed-off-by: default avatarSapthagiri Baratam <sapthagiri.baratam@cirrus.com>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent e79d2308
...@@ -52,8 +52,10 @@ int arizona_clk32k_enable(struct arizona *arizona) ...@@ -52,8 +52,10 @@ int arizona_clk32k_enable(struct arizona *arizona)
if (ret != 0) if (ret != 0)
goto err_ref; goto err_ref;
ret = clk_prepare_enable(arizona->mclk[ARIZONA_MCLK1]); ret = clk_prepare_enable(arizona->mclk[ARIZONA_MCLK1]);
if (ret != 0) if (ret != 0) {
goto err_pm; pm_runtime_put_sync(arizona->dev);
goto err_ref;
}
break; break;
case ARIZONA_32KZ_MCLK2: case ARIZONA_32KZ_MCLK2:
ret = clk_prepare_enable(arizona->mclk[ARIZONA_MCLK2]); ret = clk_prepare_enable(arizona->mclk[ARIZONA_MCLK2]);
...@@ -67,8 +69,6 @@ int arizona_clk32k_enable(struct arizona *arizona) ...@@ -67,8 +69,6 @@ int arizona_clk32k_enable(struct arizona *arizona)
ARIZONA_CLK_32K_ENA); ARIZONA_CLK_32K_ENA);
} }
err_pm:
pm_runtime_put_sync(arizona->dev);
err_ref: err_ref:
if (ret != 0) if (ret != 0)
arizona->clk32k_ref--; arizona->clk32k_ref--;
......
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