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

Commit d04d2ca9 authored by Deepak Katragadda's avatar Deepak Katragadda Committed by Gerrit - the friendly Code Review server
Browse files

clk: qcom: Update the FMAX tables for PLLs on SDM845 



The FMAX tables being used currently for PLLs are incorrect.
Use the correct FMAXes for the fabia PLLs.

Change-Id: I919a6ab09f30c1f56e2b4f023c7fcc876cd70c20
Signed-off-by: default avatarDeepak Katragadda <dkatraga@codeaurora.org>
parent 4dc00685

drivers/clk/qcom/camcc-sdm845.c

+20 −12
Original line number Diff line number Diff line
@@ -107,9 +107,11 @@ static struct clk_alpha_pll cam_cc_pll0 = { 
			.parent_names = (const char *[]){ "bi_tcxo" },

			.num_parents = 1,

			.ops = &clk_fabia_pll_ops,

			VDD_CX_FMAX_MAP2(

				MIN, 19200000,

				LOWER, 600000000),

			VDD_CX_FMAX_MAP4(

				MIN, 615000000,

				LOW, 1066000000,

				LOW_L1, 1600000000,

				NOMINAL, 2000000000),

		},

	},

};
@@ -152,9 +154,11 @@ static struct clk_alpha_pll cam_cc_pll1 = { 
			.parent_names = (const char *[]){ "bi_tcxo" },

			.num_parents = 1,

			.ops = &clk_fabia_pll_ops,

			VDD_CX_FMAX_MAP2(

				MIN, 19200000,

				LOW, 808000000),

			VDD_CX_FMAX_MAP4(

				MIN, 615000000,

				LOW, 1066000000,

				LOW_L1, 1600000000,

				NOMINAL, 2000000000),

		},

	},

};
@@ -189,9 +193,11 @@ static struct clk_alpha_pll cam_cc_pll2 = { 
			.parent_names = (const char *[]){ "bi_tcxo" },

			.num_parents = 1,

			.ops = &clk_fabia_pll_ops,

			VDD_MX_FMAX_MAP2(

				MIN, 19200000,

				LOWER, 960000000),

			VDD_MX_FMAX_MAP4(

				MIN, 615000000,

				LOW, 1066000000,

				LOW_L1, 1600000000,

				NOMINAL, 2000000000),

		},

	},

};
@@ -248,9 +254,11 @@ static struct clk_alpha_pll cam_cc_pll3 = { 
			.parent_names = (const char *[]){ "bi_tcxo" },

			.num_parents = 1,

			.ops = &clk_fabia_pll_ops,

			VDD_CX_FMAX_MAP2(

				MIN, 19200000,

				LOWER, 384000000),

			VDD_CX_FMAX_MAP4(

				MIN, 615000000,

				LOW, 1066000000,

				LOW_L1, 1600000000,

				NOMINAL, 2000000000),

		},

	},

};

drivers/clk/qcom/dispcc-sdm845.c

+5 −4
Original line number Diff line number Diff line
@@ -146,10 +146,11 @@ static struct clk_alpha_pll disp_cc_pll0 = { 
			.parent_names = (const char *[]){ "bi_tcxo" },

			.num_parents = 1,

			.ops = &clk_fabia_pll_ops,

			VDD_CX_FMAX_MAP2(

				MIN, 430000000,

				LOW, 860000000

			),

			VDD_CX_FMAX_MAP4(

				MIN, 615000000,

				LOW, 1066000000,

				LOW_L1, 1600000000,

				NOMINAL, 2000000000),

		},

	},

};

drivers/clk/qcom/gcc-sdm845.c

+10 −1
Original line number Diff line number Diff line
@@ -168,6 +168,11 @@ static struct clk_alpha_pll gpll0 = { 
			.parent_names = (const char *[]){ "bi_tcxo" },

			.num_parents = 1,

			.ops = &clk_fabia_fixed_pll_ops,

			VDD_CX_FMAX_MAP4(

				MIN, 615000000,

				LOW, 1066000000,

				LOW_L1, 1600000000,

				NOMINAL, 2000000000),

		},

	},

};
@@ -207,7 +212,11 @@ static struct clk_alpha_pll gpll1 = { 
			.parent_names = (const char *[]){ "bi_tcxo" },

			.num_parents = 1,

			.ops = &clk_fabia_fixed_pll_ops,

			VDD_CX_FMAX_MAP1(MIN, 1066000000),

			VDD_CX_FMAX_MAP4(

				MIN, 615000000,

				LOW, 1066000000,

				LOW_L1, 1600000000,

				NOMINAL, 2000000000),

		},

	},

};

drivers/clk/qcom/vdd-level-sdm845.h

+0 −8
Original line number Diff line number Diff line
@@ -90,14 +90,6 @@ 
	},					\

	.num_rate_max = VDD_CX_NUM



#define VDD_MX_FMAX_MAP2(l1, f1, l2, f2) \

	.vdd_class = &vdd_mx,			\

	.rate_max = (unsigned long[VDD_CX_NUM]) {	\

		[VDD_CX_##l1] = (f1),		\

		[VDD_CX_##l2] = (f2),		\

	},					\

	.num_rate_max = VDD_CX_NUM



#define VDD_MX_FMAX_MAP4(l1, f1, l2, f2, l3, f3, l4, f4) \

	.vdd_class = &vdd_mx,			\

	.rate_max = (unsigned long[VDD_CX_NUM]) {	\

drivers/clk/qcom/videocc-sdm845.c

+5 −7
Original line number Diff line number Diff line
@@ -83,13 +83,11 @@ static struct clk_alpha_pll video_pll0 = { 
			.parent_names = (const char *[]){ "bi_tcxo" },

			.num_parents = 1,

			.ops = &clk_fabia_pll_ops,

			VDD_CX_FMAX_MAP5(

				MIN, 200000000,

				LOW, 640000000,

				LOW_L1, 760000000,

				NOMINAL, 1332000000,

				HIGH, 1599000000),



			VDD_CX_FMAX_MAP4(

				MIN, 615000000,

				LOW, 1066000000,

				LOW_L1, 1600000000,

				NOMINAL, 2000000000),

		},

	},

};