Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7d9a185 authored by Stephen Boyd's avatar Stephen Boyd Committed by Amit Nischal
Browse files

clk: qcom: Add support for BRANCH_HALT_SKIP flag for branch clocks 



There could be few clocks where the clock status bit is not
required to be polled as the clock on/off would be controlled
by enabling/disabling external source. Add support for the
same by introducing new flag named as 'BRANCH_HALT_SKIP'.

Signed-off-by: default avatarAmit Nischal <anischal@codeaurora.org>
[sboyd@kernel.org: Rename flag to BRANCH_HALT_SKIP]
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
(cherry picked from commit 7d99ced8f4c65267836db69ec0790e878ef11b3b)
Git-commit: 7d99ced8f4c65267836db69ec0790e878ef11b3b
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git



Change-Id: I955b9e77c4889fc95ac864059d1a44e9ebe3daed
Signed-off-by: default avatarAmit Nischal <anischal@codeaurora.org>
parent 8588eafd

drivers/clk/qcom/clk-branch.c

+5 −2
Original line number Diff line number Diff line
@@ -83,8 +83,11 @@ static int clk_branch_wait(const struct clk_branch *br, bool enabling, 
	const struct clk_hw *hw = &br->clkr.hw;

	const char *name = clk_hw_get_name(hw);



	/* Skip checking halt bit if the clock is in hardware gated mode */

	if (clk_branch_in_hwcg_mode(br))

	/*

	 * Skip checking halt bit if we're explicitly ignoring the bit or the

	 * clock is in hardware gated mode

	 */

	if (br->halt_check == BRANCH_HALT_SKIP || clk_branch_in_hwcg_mode(br))

		return 0;



	if (br->halt_check == BRANCH_HALT_DELAY || (!enabling && voted)) {

drivers/clk/qcom/clk-branch.h

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ struct clk_branch { 
#define BRANCH_HALT_ENABLE		1 /* pol: 0 = halt */

#define BRANCH_HALT_ENABLE_VOTED	(BRANCH_HALT_ENABLE | BRANCH_VOTED)

#define BRANCH_HALT_DELAY		2 /* No bit to check; just delay */

#define BRANCH_HALT_SKIP		3 /* Don't check halt bit */



	struct clk_regmap clkr;

};