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

Commit 4d5d6b55 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "clk: qcom: Update the clk structure parameters for GPUCC/DISPCC clks"

parents 5a1afe90 1fdcce59

drivers/clk/qcom/dispcc-monaco.c

+0 −1
Original line number Diff line number Diff line
@@ -254,7 +254,6 @@ static struct clk_rcg2 disp_cc_sleep_clk_src = { 
	.hid_width = 5,

	.parent_map = disp_cc_parent_map_4,

	.freq_tbl = ftbl_disp_cc_sleep_clk_src,

	.enable_safe_config = true,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "disp_cc_sleep_clk_src",

		.parent_data = disp_cc_parent_data_4,

drivers/clk/qcom/gpucc-monaco.c

+2 −2
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ static struct clk_branch gpu_cc_cxo_aon_clk = { 


static struct clk_branch gpu_cc_cxo_clk = {

	.halt_reg = 0x418c,

	.halt_check = BRANCH_HALT,

	.halt_check = BRANCH_HALT_DELAY,

	.clkr = {

		.enable_reg = 0x418c,

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


static struct clk_branch gpu_cc_gx_cxo_clk = {

	.halt_reg = 0x416c,

	.halt_check = BRANCH_HALT,

	.halt_check = BRANCH_HALT_DELAY,

	.clkr = {

		.enable_reg = 0x416c,

		.enable_mask = BIT(0),