Merge "clk: qcom: Support for 980MHz for GPU clock for TRINKET" (e28b72e6) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/clk/qcom/gpucc-trinket.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -194,6 +194,8 @@ static const struct freq_tbl ftbl_gpu_cc_gx_gfx3d_clk_src[] = {
		F(745000000, P_GPU_CC_PLL0_OUT_AUX2, 2, 0, 0),
		F(820000000, P_GPU_CC_PLL0_OUT_AUX2, 2, 0, 0),
		F(900000000, P_GPU_CC_PLL0_OUT_AUX2, 2, 0, 0),
		F(950000000, P_GPU_CC_PLL0_OUT_AUX2, 2, 0, 0),
		F(980000000, P_GPU_CC_PLL0_OUT_AUX2, 2, 0, 0),
		{ }
		};

		@@ -218,7 +220,8 @@ static struct clk_rcg2 gpu_cc_gx_gfx3d_clk_src = {
		[VDD_LOW_L1] = 600000000,
		[VDD_NOMINAL] = 745000000,
		[VDD_NOMINAL_L1] = 820000000,
		[VDD_HIGH] = 900000000},
		[VDD_HIGH] = 900000000,
		[VDD_HIGH_L1] = 980000000},
		},
		};

+4 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ enum vdd_mx_levels {
		VDD_MX_LOW_L1, /* SVSL1 */
		VDD_MX_NOMINAL, /* NOM */
		VDD_MX_HIGH, /* TURBO */
		VDD_MX_HIGH_L1, /* TURBO_L1 */
		VDD_MX_NUM,
		};

		@@ -36,6 +37,7 @@ static int vdd_mx_corner[] = {
		RPM_REGULATOR_LEVEL_SVS_PLUS, /* VDD_LOW_L1 */
		RPM_REGULATOR_LEVEL_NOM, /* VDD_NOMINAL */
		RPM_REGULATOR_LEVEL_TURBO, /* VDD_HIGH */
		RPM_REGULATOR_LEVEL_TURBO_NO_CPR, /* VDD_HIGH_L1 */
		RPM_REGULATOR_LEVEL_MAX
		};

		@@ -48,6 +50,7 @@ enum vdd_dig_levels {
		VDD_NOMINAL, /* NOM */
		VDD_NOMINAL_L1, /* NOM */
		VDD_HIGH, /* TURBO */
		VDD_HIGH_L1, /* TURBO_L1 */
		VDD_NUM,
		};

		@@ -60,6 +63,7 @@ static int vdd_corner[] = {
		RPM_REGULATOR_LEVEL_NOM, /* VDD_NOMINAL */
		RPM_REGULATOR_LEVEL_NOM_PLUS, /* VDD_NOMINAL */
		RPM_REGULATOR_LEVEL_TURBO, /* VDD_HIGH */
		RPM_REGULATOR_LEVEL_TURBO_NO_CPR, /* VDD_HIGH_L1 */
		RPM_REGULATOR_LEVEL_MAX
		};