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

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

Merge "clk: qcom: Update PLL configuration and frequency plan for Lagoon"

parents ae10fe0e 4da09d23

drivers/clk/qcom/dispcc-lagoon.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static const struct alpha_pll_config disp_cc_pll0_config = { 
	.config_ctl_val = 0x20485699,

	.config_ctl_hi_val = 0x00002067,

	.test_ctl_val = 0x40000000,

	.test_ctl_hi_val = 0x00000000,

	.test_ctl_hi_val = 0x00000002,

	.user_ctl_val = 0x00000000,

	.user_ctl_hi_val = 0x00004805,

};

drivers/clk/qcom/gpucc-lagoon.c

+6 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

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

 * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.

 */



#define pr_fmt(fmt) "clk: %s: " fmt, __func__
@@ -92,6 +92,8 @@ static const struct alpha_pll_config gpu_cc_pll0_config = { 
	.alpha = 0x5AAA,

	.config_ctl_val = 0x20485699,

	.config_ctl_hi_val = 0x00002067,

	.test_ctl_val = 0x40000000,

	.test_ctl_hi_val = 0x00000002,

	.user_ctl_val = 0x00000001,

	.user_ctl_hi_val = 0x00004805,

};
@@ -137,6 +139,8 @@ static const struct alpha_pll_config gpu_cc_pll1_config = { 
	.alpha = 0xC555,

	.config_ctl_val = 0x20485699,

	.config_ctl_hi_val = 0x00002067,

	.test_ctl_val = 0x40000000,

	.test_ctl_hi_val = 0x00000002,

	.user_ctl_val = 0x00000001,

	.user_ctl_hi_val = 0x00004805,

};
@@ -194,6 +198,7 @@ static const struct freq_tbl ftbl_gpu_cc_gx_gfx3d_clk_src[] = { 
	F(565000000, P_CRC_DIV, 1, 0, 0),

	F(650000000, P_CRC_DIV, 1, 0, 0),

	F(800000000, P_CRC_DIV, 1, 0, 0),

	F(825000000, P_CRC_DIV, 1, 0, 0),

	F(850000000, P_CRC_DIV, 1, 0, 0),

	{ }

};

drivers/clk/qcom/videocc-lagoon.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

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

 * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.

 */



#define pr_fmt(fmt) "clk: %s: " fmt, __func__
@@ -78,7 +78,7 @@ static const struct alpha_pll_config video_pll0_config = { 
	.config_ctl_val = 0x20485699,

	.config_ctl_hi_val = 0x00002067,

	.test_ctl_val = 0x40000000,

	.test_ctl_hi_val = 0x00000000,

	.test_ctl_hi_val = 0x00000002,

	.user_ctl_val = 0x00000101,

	.user_ctl_hi_val = 0x00004005,

};