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

Commit 8c6689fa 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: mdss: update PLL configuration for 8996"

parents a2f18944 90b123ae

drivers/clk/msm/mdss/mdss-dsi-pll-8996-util.c

+2 −2
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ static void mdss_dsi_pll_8996_input_init(struct mdss_pll_resources *pll, 
	pdb->in.pll_icpcset_m = 0;	/* 0, reg: 0x04f8, bit 3 - 5 */

	pdb->in.pll_lpf_res1 = 3;	/* 3, reg: 0x0504, bit 0 - 3 */

	pdb->in.pll_lpf_cap1 = 11;	/* 11, reg: 0x0500, bit 0 - 3 */

	pdb->in.pll_lpf_cap2 = 14;	/* 14, reg: 0x0500, bit 4 - 7 */

	pdb->in.pll_lpf_cap2 = 1;	/* 1, reg: 0x0500, bit 4 - 7 */

	pdb->in.pll_iptat_trim = 7;

	pdb->in.pll_c3ctrl = 2;		/* 2 */

	pdb->in.pll_r3ctrl = 1;		/* 1 */
@@ -548,7 +548,7 @@ static void pll_8996_calc_vco_count(struct dsi_pll_db *pdb, 
	pout->pll_kvco_count = cnt;



	pout->pll_misc1 = 16;

	pout->pll_resetsm_cntrl = 0;

	pout->pll_resetsm_cntrl = 48;

	pout->pll_resetsm_cntrl2 = pin->bandgap_timer << 3;

	pout->pll_resetsm_cntrl5 = pin->pll_wakeup_timer;

	pout->pll_kvco_code = 0;

drivers/clk/msm/mdss/mdss-dsi-pll-8996.h

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -131,7 +131,7 @@ struct dsi_pll_input { 


	u32 pll_lpf_res1;	/* 3, reg: 0x0504, bit 0 - 3 */

	u32 pll_lpf_cap1;	/* 11, reg: 0x0500, bit 0 - 3 */

	u32 pll_lpf_cap2;	/* 14, reg: 0x0500, bit 4 - 7 */

	u32 pll_lpf_cap2;	/* 1, reg: 0x0500, bit 4 - 7 */

	u32 pll_c3ctrl;		/* 2, reg: 0x04c4 */

	u32 pll_r3ctrl;		/* 1, reg: 0x04c4 */

};