Merge "clk: qcom: gcc: Update frequency table and Fmax for blsp_qup clk" (ea5c8c96) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/clk/qcom/gcc-qcs405.c

+21 −9

Original line number	Diff line number	Diff line
		@@ -525,10 +525,10 @@ static const struct freq_tbl ftbl_blsp1_qup1_spi_apps_clk_src[] = {
		F(960000, P_XO, 10, 1, 2),
		F(4800000, P_XO, 4, 0, 0),
		F(9600000, P_XO, 2, 0, 0),
		F(10480000, P_GPLL0_OUT_MAIN, 1, 3, 229),
		F(16000000, P_GPLL0_OUT_MAIN, 10, 1, 5),
		F(19200000, P_XO, 1, 0, 0),
		F(25000000, P_GPLL0_OUT_MAIN, 16, 1, 2),
		F(30000000, P_GPLL0_OUT_MAIN, 1, 3, 80),
		F(20961000, P_GPLL0_OUT_MAIN, 1, 6, 229),
		{ }
		};

		@@ -546,8 +546,8 @@ static struct clk_rcg2 blsp1_qup1_spi_apps_clk_src = {
		.vdd_class = &vdd_cx,
		.num_rate_max = VDD_NUM,
		.rate_max = (unsigned long[VDD_NUM]) {
		[VDD_LOW] = 25000000,
		[VDD_NOMINAL] = 30000000},
		[VDD_LOW] = 10500000,
		[VDD_NOMINAL] = 21000000},
		},
		};

		@@ -569,12 +569,24 @@ static struct clk_rcg2 blsp1_qup2_i2c_apps_clk_src = {
		},
		};

		static const struct freq_tbl ftbl_blsp1_qup2_spi_apps_clk_src[] = {
		F(960000, P_XO, 10, 1, 2),
		F(4800000, P_XO, 4, 0, 0),
		F(9600000, P_XO, 2, 0, 0),
		F(15000000, P_GPLL0_OUT_MAIN, 1, 3, 160),
		F(16000000, P_GPLL0_OUT_MAIN, 10, 1, 5),
		F(19200000, P_XO, 1, 0, 0),
		F(25000000, P_GPLL0_OUT_MAIN, 16, 1, 2),
		F(30000000, P_GPLL0_OUT_MAIN, 1, 3, 80),
		{ }
		};

		static struct clk_rcg2 blsp1_qup2_spi_apps_clk_src = {
		.cmd_rcgr = 0x3014,
		.mnd_width = 8,
		.hid_width = 5,
		.parent_map = gcc_parent_map_0,
		.freq_tbl = ftbl_blsp1_qup1_spi_apps_clk_src,
		.freq_tbl = ftbl_blsp1_qup2_spi_apps_clk_src,
		.clkr.hw.init = &(struct clk_init_data){
		.name = "blsp1_qup2_spi_apps_clk_src",
		.parent_names = gcc_parent_names_0,
		@@ -583,7 +595,7 @@ static struct clk_rcg2 blsp1_qup2_spi_apps_clk_src = {
		.vdd_class = &vdd_cx,
		.num_rate_max = VDD_NUM,
		.rate_max = (unsigned long[VDD_NUM]) {
		[VDD_LOW] = 25000000,
		[VDD_LOW] = 15000000,
		[VDD_NOMINAL] = 30000000},
		},
		};