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

Commit 60d6739b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "clk: msm: gcc: Add support for 40MHz for SPI clocks for msm8917"

parents ce95d364 5ac57633
Loading
Loading
Loading
Loading
+26 −0
Original line number Diff line number Diff line
@@ -868,6 +868,17 @@ static struct rcg_clk blsp1_qup1_i2c_apps_clk_src = {
};

static struct clk_freq_tbl ftbl_gcc_blsp1_2_qup1_4_spi_apps_clk[] = {
	F( 960000,	xo,	10,	1,	2),
	F( 4800000,	xo,	4,	0,	0),
	F( 9600000,	xo,	2,	0,	0),
	F( 16000000,	gpll0,	10,	1,	5),
	F( 19200000,	xo,	1,	0,	0),
	F( 25000000,	gpll0,	16,	1,	2),
	F( 50000000,	gpll0,	16,	0,	0),
	F_END
};

static struct clk_freq_tbl ftbl_gcc_blsp1_2_qup1_4_spi_apps_clk_8917[] = {
	F( 960000,	xo,	10,	1,	2),
	F( 4800000,	xo,	4,	0,	0),
	F( 9600000,	xo,	2,	0,	0),
@@ -4425,6 +4436,21 @@ static int msm_gcc_probe(struct platform_device *pdev)
		vdd_hf_pll.cur_level = VDD_HF_PLL_NUM_8917;
		get_speed_bin(pdev, &speed_bin);
		override_for_8917(speed_bin);

		if (compat_bin2) {
			blsp1_qup2_spi_apps_clk_src.freq_tbl =
				ftbl_gcc_blsp1_2_qup1_4_spi_apps_clk_8917;
			blsp1_qup3_spi_apps_clk_src.freq_tbl =
				ftbl_gcc_blsp1_2_qup1_4_spi_apps_clk_8917;
			blsp1_qup4_spi_apps_clk_src.freq_tbl =
				ftbl_gcc_blsp1_2_qup1_4_spi_apps_clk_8917;
			blsp2_qup1_spi_apps_clk_src.freq_tbl =
				ftbl_gcc_blsp1_2_qup1_4_spi_apps_clk_8917;
			blsp2_qup2_spi_apps_clk_src.freq_tbl =
				ftbl_gcc_blsp1_2_qup1_4_spi_apps_clk_8917;
			blsp2_qup3_spi_apps_clk_src.freq_tbl =
				ftbl_gcc_blsp1_2_qup1_4_spi_apps_clk_8917;
		}
	} else {
		gpll0_clk_src.c.parent = &gpll0_clk_src_8952.c;
		gpll0_ao_clk_src.c.parent = &gpll0_ao_clk_src_8952.c;