Merge "clk: qcom: gcc-sdm845: Add the BRANCH_VOTED flag to certain votable clocks" into msm-4.9 (1f3d186e) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/clk/qcom/gcc-sdm845.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1478,7 +1478,7 @@ static struct clk_branch gcc_cxo_tx1_clkref_clk = {

		static struct clk_branch gcc_ddrss_gpu_axi_clk = {
		.halt_reg = 0x44038,
		.halt_check = BRANCH_HALT,
		.halt_check = BRANCH_VOTED,
		.clkr = {
		.enable_reg = 0x44038,
		.enable_mask = BIT(0),
		@@ -1665,7 +1665,7 @@ static struct clk_gate2 gcc_gpu_gpll0_div_clk_src = {

		static struct clk_branch gcc_gpu_memnoc_gfx_clk = {
		.halt_reg = 0x7100c,
		.halt_check = BRANCH_HALT,
		.halt_check = BRANCH_VOTED,
		.clkr = {
		.enable_reg = 0x7100c,
		.enable_mask = BIT(0),