evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clk: qcom: Remove non-op BRANCH_HALT_NO_CHECK_ON_DISABLE flag

Browse source 
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: Amit Nischal <anischal@codeaurora.org>
This commit is contained in:
Amit Nischal 2016-10-21 21:10:56 +05:30
parent 5f559180ab
commit e6b3e3eb27
2 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/clk/qcom/clk-branch.c
View file

@ -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)) { if (br->halt_check == BRANCH_HALT_DELAY || (!enabling && voted)) {
udelay(10); udelay(10);
} else if ((br->halt_check == BRANCH_HALT_NO_CHECK_ON_DISABLE) &&
!enabling) {
return 0;
} else if (br->halt_check == BRANCH_HALT_ENABLE || } else if (br->halt_check == BRANCH_HALT_ENABLE ||
br->halt_check == BRANCH_HALT || br->halt_check == BRANCH_HALT ||
(enabling && voted)) { (enabling && voted)) {

4
drivers/clk/qcom/clk-branch.h
View file

@ -42,10 +42,6 @@ struct clk_branch {
#define BRANCH_HALT_ENABLE 1 /* pol: 0 = halt */ #define BRANCH_HALT_ENABLE 1 /* pol: 0 = halt */
#define BRANCH_HALT_ENABLE_VOTED (BRANCH_HALT_ENABLE | BRANCH_VOTED) #define BRANCH_HALT_ENABLE_VOTED (BRANCH_HALT_ENABLE | BRANCH_VOTED)
#define BRANCH_HALT_DELAY 2 /* No bit to check; just delay */ #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; struct clk_regmap clkr;
}; };