Merge "clk: qcom: clock-gcc-8936: Fix clock code for MSM8939" (8c3d818d) · Commits · e / devices / android_kernel_sony_msm8994

drivers/clk/qcom/clock-gcc-8936.c

+10 −6

Original line number	Diff line number	Diff line
		@@ -294,6 +294,7 @@ static void __iomem *virt_dbgbase;

		/* Mux source select values */
		#define gcc_xo_source_val 0
		#define xo_a_clk_source_val 0
		#define gpll0_out_main_source_val 1
		#define gpll0_out_aux_source_val 5
		#define gpll0_usbfs_source_val 2
		@@ -673,7 +674,7 @@ static struct pll_vote_clk gpll4 = {
		DEFINE_EXT_CLK(gpll4_out_main, &gpll4.c);

		static struct clk_freq_tbl ftbl_apss_ahb_clk[] = {
		F( 19200000, gcc_xo, 1, 0, 0),
		F( 19200000, xo_a_clk, 1, 0, 0),
		F( 50000000, gpll0_out_main, 16, 0, 0),
		F( 100000000, gpll0_out_main, 8, 0, 0),
		F( 133330000, gpll0_out_main, 6, 0, 0),
		@@ -689,8 +690,6 @@ static struct rcg_clk apss_ahb_clk_src = {
		.c = {
		.dbg_name = "apss_ahb_clk_src",
		.ops = &clk_ops_rcg,
		VDD_DIG_FMAX_MAP3(LOW, 50000000, NOMINAL, 100000000, HIGH,
		133330000),
		CLK_INIT(apss_ahb_clk_src.c),
		},
		};
		@@ -1165,10 +1164,15 @@ static struct rcg_clk mclk1_clk_src = {
		},
		};

		static struct clk_freq_tbl ftbl_gcc_camss_mclk2_clk[] = {
		F( 66670000, gpll0_out_main, 12, 0, 0),
		F_END
		};

		static struct rcg_clk mclk2_clk_src = {
		.cmd_rcgr_reg = MCLK2_CMD_RCGR,
		.set_rate = set_rate_mnd,
		.freq_tbl = ftbl_gcc_camss_mclk0_1_2_clk,
		.freq_tbl = ftbl_gcc_camss_mclk2_clk,
		.current_freq = &rcg_dummy_freq,
		.base = &virt_bases[GCC_BASE],
		.c = {
		@@ -2098,6 +2102,7 @@ static struct branch_clk gcc_camss_mclk2_clk = {

		static struct branch_clk gcc_camss_micro_ahb_clk = {
		.cbcr_reg = CAMSS_MICRO_AHB_CBCR,
		.bcr_reg = CAMSS_MICRO_BCR,
		.has_sibling = 1,
		.base = &virt_bases[GCC_BASE],
		.c = {
		@@ -2194,7 +2199,6 @@ static struct branch_clk gcc_camss_vfe0_clk = {

		static struct branch_clk gcc_camss_vfe_ahb_clk = {
		.cbcr_reg = CAMSS_VFE_AHB_CBCR,
		.bcr_reg = CAMSS_MICRO_BCR,
		.has_sibling = 0,
		.base = &virt_bases[GCC_BASE],
		.c = {
		@@ -3019,7 +3023,7 @@ static struct mux_clk gcc_debug_mux = {
		{&gcc_mdss_byte1_clk.c, 0x01bb},
		{&gcc_mdss_esc0_clk.c, 0x01fd},
		{&gcc_mdss_esc1_clk.c, 0x01bc},
		{&gcc_bimc_gpu_clk.c, 0x015c},
		{&gcc_bimc_gpu_clk.c, 0x0157},
		{&wcnss_m_clk.c, 0x0198},
		),
		.c = {