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: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230208091340.124641-4-konrad.dybcio@linaro.org

diff --git a/drivers/clk/qcom/clk-branch.c b/drivers/clk/qcom/clk-branch.c
index f869fc6aaed64e79e6bd8af7a7d13d18de5a44f2..f2b577b07b7ee91b16863df7102890def79d47c9 100644 (file)
--- a/drivers/clk/qcom/clk-branch.c
+++ b/drivers/clk/qcom/clk-branch.c
@@ -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;

diff --git a/drivers/clk/qcom/clk-branch.h b/drivers/clk/qcom/clk-branch.h
index b325f943c3e06dcb3131a17234ffd96a8b59d1bf..9bec563ab4eeee42020820983196186740219514 100644 (file)
--- a/drivers/clk/qcom/clk-branch.h
+++ b/drivers/clk/qcom/clk-branch.h
@@ -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)