Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21438a7d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "clk: qcom: gcc-sdm845: Add the BRANCH_VOTED flag to the GCC GPU clocks"

parents 5965c673 0166f312

drivers/clk/qcom/gcc-sdm855.c

+3 −3
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1975,7 +1975,7 @@ static struct clk_branch gcc_cpuss_rbcpr_clk = { 


static struct clk_branch gcc_ddrss_gpu_axi_clk = {

	.halt_reg = 0x71154,

	.halt_check = BRANCH_HALT,

	.halt_check = BRANCH_VOTED,

	.clkr = {

		.enable_reg = 0x71154,

		.enable_mask = BIT(0),
@@ -2225,7 +2225,7 @@ static struct clk_branch gcc_gpu_iref_clk = { 


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),