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

Commit 3875800c 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: Update the PLL configurations on SDM855"

parents 4f2f8145 321f72d4

drivers/clk/qcom/camcc-sdm855.c

+34 −4
Original line number Original line 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

 * 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

 * it under the terms of the GNU General Public License version 2 and
@@ -130,8 +130,14 @@ static struct pll_vco trion_vco[] = { 
};

};





static const struct alpha_pll_config cam_cc_pll0_config = {

static const struct alpha_pll_config cam_cc_pll0_config = {

	.l = 0x3e,

	.l = 0x3E,

	.alpha = 0x8000,

	.alpha = 0x8000,

	.config_ctl_val = 0x20485699,

	.config_ctl_hi_val = 0x00002267,

	.config_ctl_hi1_val = 0x00000024,

	.user_ctl_val = 0x00000000,

	.user_ctl_hi_val = 0x00000805,

	.user_ctl_hi1_val = 0x000000D0,

};

};





static struct clk_alpha_pll cam_cc_pll0 = {

static struct clk_alpha_pll cam_cc_pll0 = {
@@ -205,6 +211,12 @@ static struct clk_alpha_pll_postdiv cam_cc_pll0_out_odd = { 
static const struct alpha_pll_config cam_cc_pll1_config = {

static const struct alpha_pll_config cam_cc_pll1_config = {

	.l = 0x13,

	.l = 0x13,

	.alpha = 0x8800,

	.alpha = 0x8800,

	.config_ctl_val = 0x20485699,

	.config_ctl_hi_val = 0x00002267,

	.config_ctl_hi1_val = 0x00000024,

	.user_ctl_val = 0x00000000,

	.user_ctl_hi_val = 0x00000805,

	.user_ctl_hi1_val = 0x000000D0,

};

};





static struct clk_alpha_pll cam_cc_pll1 = {

static struct clk_alpha_pll cam_cc_pll1 = {
@@ -247,6 +259,12 @@ static struct clk_alpha_pll_postdiv cam_cc_pll1_out_even = { 
static const struct alpha_pll_config cam_cc_pll2_config = {

static const struct alpha_pll_config cam_cc_pll2_config = {

	.l = 0x32,

	.l = 0x32,

	.alpha = 0x0,

	.alpha = 0x0,

	.config_ctl_val = 0x10000927,

	.config_ctl_hi_val = 0x00000011,

	.config_ctl_hi1_val = 0x04300142,

	.test_ctl_val = 0x00000000,

	.test_ctl_hi_val = 0x00004000,

	.test_ctl_hi1_val = 0x00000000,

};

};





static struct clk_alpha_pll cam_cc_pll2 = {

static struct clk_alpha_pll cam_cc_pll2 = {
@@ -297,7 +315,13 @@ static struct clk_alpha_pll_postdiv cam_cc_pll2_out_main = { 




static const struct alpha_pll_config cam_cc_pll3_config = {

static const struct alpha_pll_config cam_cc_pll3_config = {

	.l = 0x14,

	.l = 0x14,

	.alpha = 0xd555,

	.alpha = 0xD555,

	.config_ctl_val = 0x20485699,

	.config_ctl_hi_val = 0x00002267,

	.config_ctl_hi1_val = 0x00000024,

	.user_ctl_val = 0x00000000,

	.user_ctl_hi_val = 0x00000805,

	.user_ctl_hi1_val = 0x000000D0,

};

};





static struct clk_alpha_pll cam_cc_pll3 = {

static struct clk_alpha_pll cam_cc_pll3 = {
@@ -339,7 +363,13 @@ static struct clk_alpha_pll_postdiv cam_cc_pll3_out_even = { 




static const struct alpha_pll_config cam_cc_pll4_config = {

static const struct alpha_pll_config cam_cc_pll4_config = {

	.l = 0x14,

	.l = 0x14,

	.alpha = 0xd555,

	.alpha = 0xD555,

	.config_ctl_val = 0x20485699,

	.config_ctl_hi_val = 0x00002267,

	.config_ctl_hi1_val = 0x00000024,

	.user_ctl_val = 0x00000000,

	.user_ctl_hi_val = 0x00000805,

	.user_ctl_hi1_val = 0x000000D0,

};

};





static struct clk_alpha_pll cam_cc_pll4 = {

static struct clk_alpha_pll cam_cc_pll4 = {

drivers/clk/qcom/dispcc-sdm855.c

+15 −3
Original line number Original line 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

 * 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

 * it under the terms of the GNU General Public License version 2 and
@@ -172,7 +172,13 @@ static struct pll_vco trion_vco[] = { 




static const struct alpha_pll_config disp_cc_pll0_config = {

static const struct alpha_pll_config disp_cc_pll0_config = {

	.l = 0x47,

	.l = 0x47,

	.alpha = 0xe000,

	.alpha = 0xE000,

	.config_ctl_val = 0x20485699,

	.config_ctl_hi_val = 0x00002267,

	.config_ctl_hi1_val = 0x00000024,

	.user_ctl_val = 0x00000000,

	.user_ctl_hi_val = 0x00000805,

	.user_ctl_hi1_val = 0x000000D0,

};

};





static struct clk_alpha_pll disp_cc_pll0 = {

static struct clk_alpha_pll disp_cc_pll0 = {
@@ -198,8 +204,14 @@ static struct clk_alpha_pll disp_cc_pll0 = { 
};

};





static const struct alpha_pll_config disp_cc_pll1_config = {

static const struct alpha_pll_config disp_cc_pll1_config = {

	.l = 0x1f,

	.l = 0x1F,

	.alpha = 0x4000,

	.alpha = 0x4000,

	.config_ctl_val = 0x20485699,

	.config_ctl_hi_val = 0x00002267,

	.config_ctl_hi1_val = 0x00000024,

	.user_ctl_val = 0x00000000,

	.user_ctl_hi_val = 0x00000805,

	.user_ctl_hi1_val = 0x000000D0,

};

};





static struct clk_alpha_pll disp_cc_pll1 = {

static struct clk_alpha_pll disp_cc_pll1 = {

drivers/clk/qcom/npucc-sdm855.c

+15 −3
Original line number Original line 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

 * 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

 * it under the terms of the GNU General Public License version 2 and
@@ -72,8 +72,14 @@ static struct pll_vco trion_vco[] = { 
};

};





static const struct alpha_pll_config npu_cc_pll0_config = {

static const struct alpha_pll_config npu_cc_pll0_config = {

	.l = 0x48,

	.l = 0x3E,

	.alpha = 0xeaaa,

	.alpha = 0x8000,

	.config_ctl_val = 0x20485699,

	.config_ctl_hi_val = 0x00002267,

	.config_ctl_hi1_val = 0x00000024,

	.user_ctl_val = 0x00000000,

	.user_ctl_hi_val = 0x00000805,

	.user_ctl_hi1_val = 0x000000D0,

};

};





static struct clk_alpha_pll npu_cc_pll0 = {

static struct clk_alpha_pll npu_cc_pll0 = {
@@ -124,6 +130,12 @@ static struct clk_alpha_pll_postdiv npu_cc_pll0_out_even = { 
static const struct alpha_pll_config npu_cc_pll1_config = {

static const struct alpha_pll_config npu_cc_pll1_config = {

	.l = 0x24,

	.l = 0x24,

	.alpha = 0x7555,

	.alpha = 0x7555,

	.config_ctl_val = 0x20485699,

	.config_ctl_hi_val = 0x00002267,

	.config_ctl_hi1_val = 0x00000024,

	.user_ctl_val = 0x00000000,

	.user_ctl_hi_val = 0x00000805,

	.user_ctl_hi1_val = 0x000000D0,

};

};





static struct clk_alpha_pll npu_cc_pll1 = {

static struct clk_alpha_pll npu_cc_pll1 = {

drivers/clk/qcom/videocc-sdm855.c

+9 −2
Original line number Original line 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

 * 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

 * it under the terms of the GNU General Public License version 2 and
@@ -42,6 +42,7 @@ static DEFINE_VDD_REGULATORS(vdd_mm, VDD_NUM, 1, vdd_corner); 




enum {

enum {

	P_BI_TCXO,

	P_BI_TCXO,

	P_CHIP_SLEEP_CLK,

	P_CORE_BI_PLL_TEST_SE,

	P_CORE_BI_PLL_TEST_SE,

	P_VIDEO_PLL0_OUT_EVEN,

	P_VIDEO_PLL0_OUT_EVEN,

	P_VIDEO_PLL0_OUT_MAIN,

	P_VIDEO_PLL0_OUT_MAIN,
@@ -70,7 +71,13 @@ static struct pll_vco trion_vco[] = { 




static const struct alpha_pll_config video_pll0_config = {

static const struct alpha_pll_config video_pll0_config = {

	.l = 0x14,

	.l = 0x14,

	.alpha = 0xd555,

	.alpha = 0xD555,

	.config_ctl_val = 0x20485699,

	.config_ctl_hi_val = 0x00002267,

	.config_ctl_hi1_val = 0x00000024,

	.user_ctl_val = 0x00000000,

	.user_ctl_hi_val = 0x00000805,

	.user_ctl_hi1_val = 0x000000D0,

};

};





static struct clk_alpha_pll video_pll0 = {

static struct clk_alpha_pll video_pll0 = {