Commit 6b269a41 authored Aug 21, 2018 by Sapthagiri Baratam Committed by Lee Jones Oct 23, 2018

mfd: arizona: Correct calling of runtime_put_sync



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: Sapthagiri Baratam <sapthagiri.baratam@cirrus.com>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

parent 3d51ec93

drivers/mfd/arizona-core.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -52,8 +52,10 @@ int arizona_clk32k_enable(struct arizona *arizona)
		if (ret != 0)
		goto err_ref;
		ret = clk_prepare_enable(arizona->mclk[ARIZONA_MCLK1]);
		if (ret != 0)
		goto err_pm;
		if (ret != 0) {
		pm_runtime_put_sync(arizona->dev);
		goto err_ref;
		}
		break;
		case ARIZONA_32KZ_MCLK2:
		ret = clk_prepare_enable(arizona->mclk[ARIZONA_MCLK2]);
		@@ -67,8 +69,6 @@ int arizona_clk32k_enable(struct arizona *arizona)
		ARIZONA_CLK_32K_ENA);
		}

		err_pm:
		pm_runtime_put_sync(arizona->dev);
		err_ref:
		if (ret != 0)
		arizona->clk32k_ref--;

Admin message