Merge "clk: qcom: gcc-lito: Update halt_check for bwmon clks" (3749e346) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/clk/qcom/gcc-lito.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -1366,13 +1366,12 @@ static struct clk_branch gcc_npu_axi_clk = {

		static struct clk_branch gcc_npu_bwmon2_axi_clk = {
		.halt_reg = 0x7000c,
		.halt_check = BRANCH_HALT,
		.halt_check = BRANCH_HALT_DELAY,
		.clkr = {
		.enable_reg = 0x7000c,
		.enable_mask = BIT(0),
		.hw.init = &(struct clk_init_data){
		.name = "gcc_npu_bwmon2_axi_clk",
		.flags = CLK_IS_CRITICAL,
		.ops = &clk_branch2_ops,
		},
		},
		@@ -1380,13 +1379,12 @@ static struct clk_branch gcc_npu_bwmon2_axi_clk = {

		static struct clk_branch gcc_npu_bwmon_axi_clk = {
		.halt_reg = 0x70008,
		.halt_check = BRANCH_HALT,
		.halt_check = BRANCH_HALT_DELAY,
		.clkr = {
		.enable_reg = 0x70008,
		.enable_mask = BIT(0),
		.hw.init = &(struct clk_init_data){
		.name = "gcc_npu_bwmon_axi_clk",
		.flags = CLK_IS_CRITICAL,
		.ops = &clk_branch2_ops,
		},
		},