Merge branch 'clk-fixes' into clk-next (396e339a) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/clk/qcom/gcc-msm8916.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -71,8 +71,8 @@ static const char *gcc_xo_gpll0_bimc[] = {
		static const struct parent_map gcc_xo_gpll0a_gpll1_gpll2a_map[] = {
		{ P_XO, 0 },
		{ P_GPLL0_AUX, 3 },
		{ P_GPLL2_AUX, 2 },
		{ P_GPLL1, 1 },
		{ P_GPLL2_AUX, 2 },
		};

		static const char *gcc_xo_gpll0a_gpll1_gpll2a[] = {
		@@ -1115,7 +1115,7 @@ static struct clk_rcg2 usb_hs_system_clk_src = {
		static const struct freq_tbl ftbl_gcc_venus0_vcodec0_clk[] = {
		F(100000000, P_GPLL0, 8, 0, 0),
		F(160000000, P_GPLL0, 5, 0, 0),
		F(228570000, P_GPLL0, 5, 0, 0),
		F(228570000, P_GPLL0, 3.5, 0, 0),
		{ }
		};