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

Commit e6b3e3eb authored by Amit Nischal's avatar Amit Nischal
Browse files

clk: qcom: Remove non-op BRANCH_HALT_NO_CHECK_ON_DISABLE flag 



BRANCH_HALT_NO_CHECK_ON_DISABLE flag is no longer required
for the clocks with no branch halt status check status during
clock disable so removing the usage of the flag.

Change-Id: Id58f1bf1f5b1b68acc8fe3d4d79450730f466f0b
Signed-off-by: default avatarAmit Nischal <anischal@codeaurora.org>
parent 5f559180

drivers/clk/qcom/clk-branch.c

+0 −3
Original line number Diff line number Diff line
@@ -83,9 +83,6 @@ static int clk_branch_wait(const struct clk_branch *br, bool enabling, 


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

		udelay(10);

	} else if ((br->halt_check == BRANCH_HALT_NO_CHECK_ON_DISABLE) &&

								!enabling) {

		return 0;

	} else if (br->halt_check == BRANCH_HALT_ENABLE ||

		   br->halt_check == BRANCH_HALT ||

		   (enabling && voted)) {

drivers/clk/qcom/clk-branch.h

+0 −4
Original line number Diff line number Diff line
@@ -42,10 +42,6 @@ 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 */

/* No halt check during clk disable for the clocks controlled by other masters

 * via voting registers like SMMU clocks.

 */

#define BRANCH_HALT_NO_CHECK_ON_DISABLE	4



	struct clk_regmap clkr;

};