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

Commit a27748d2 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 09a240ea b7d9a185

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;

};