Commit 5ab6561d authored by Konrad Dybcio's avatar Konrad Dybcio Committed by Bjorn Andersson
Browse files

clk: qcom: branch: Move CBCR bits definitions to the header file 



Move the definitions of CBCR bits to the branch header file.

Signed-off-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230208091340.124641-4-konrad.dybcio@linaro.org
parent 0932e565

drivers/clk/qcom/clk-branch.c

+0 −5
Original line number Diff line number Diff line
@@ -39,11 +39,6 @@ static bool clk_branch_check_halt(const struct clk_branch *br, bool enabling) 
	return !!val == !enabling;

}



#define BRANCH_CLK_OFF			BIT(31)

#define BRANCH_NOC_FSM_STATUS_SHIFT	28

#define BRANCH_NOC_FSM_STATUS_MASK	0x7

#define BRANCH_NOC_FSM_STATUS_ON	(0x2 << BRANCH_NOC_FSM_STATUS_SHIFT)



static bool clk_branch2_check_halt(const struct clk_branch *br, bool enabling)

{

	u32 val;

drivers/clk/qcom/clk-branch.h

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ struct clk_branch { 
};



/* Branch clock common bits for HLOS-owned clocks */

#define BRANCH_CLK_OFF			BIT(31)

#define BRANCH_NOC_FSM_STATUS_SHIFT	28

#define BRANCH_NOC_FSM_STATUS_MASK	0x7

#define BRANCH_NOC_FSM_STATUS_ON	(0x2 << BRANCH_NOC_FSM_STATUS_SHIFT)

#define CBCR_FORCE_MEM_CORE_ON		BIT(14)

#define CBCR_FORCE_MEM_PERIPH_ON	BIT(13)

#define CBCR_FORCE_MEM_PERIPH_OFF	BIT(12)