Merge "Revert "clk: msm: gcc: Add support for 650MHz for GPU clock for MSM8920"" (9dd67e5d) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/clk/msm/clock-gcc-8952.c

+1 −7

Original line number	Original line	Diff line number	Diff line
	@@ -4314,7 +4314,7 @@ static int msm_gcc_probe(struct platform_device *pdev)
	if (ret < 0)		if (ret < 0)
	return ret;		return ret;

	if (compat_bin2)		if (compat_bin2 \|\| compat_bin4)
	nbases = APCS_C0_PLL_BASE;		nbases = APCS_C0_PLL_BASE;

	ret = get_mmio_addr(pdev, nbases);		ret = get_mmio_addr(pdev, nbases);
	@@ -4417,12 +4417,6 @@ static int msm_gcc_probe(struct platform_device *pdev)
	vdd_hf_pll.cur_level = VDD_HF_PLL_NUM_8917;		vdd_hf_pll.cur_level = VDD_HF_PLL_NUM_8917;
	get_speed_bin(pdev, &speed_bin);		get_speed_bin(pdev, &speed_bin);
	override_for_8917(speed_bin);		override_for_8917(speed_bin);

	if (compat_bin4) {
	gfx3d_clk_src.freq_tbl =
	ftbl_gcc_oxili_gfx3d_clk_8917_650MHz;
	gfx3d_clk_src.c.fmax[VDD_DIG_HIGH] = 650000000;
	}
	} else {		} else {
	gpll0_clk_src.c.parent = &gpll0_clk_src_8952.c;		gpll0_clk_src.c.parent = &gpll0_clk_src_8952.c;
	gpll0_ao_clk_src.c.parent = &gpll0_ao_clk_src_8952.c;		gpll0_ao_clk_src.c.parent = &gpll0_ao_clk_src_8952.c;