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

Commit 930b027e authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAPDSS: add dss_calc_clock_rates() back 



dss_calc_clock_rates() was removed earlier as it was not used, but it is
needed for DSI PLL calculations, so this patch adds it back.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 7a98786c

drivers/video/omap2/dss/dss.c

+23 −0
Original line number Diff line number Diff line
@@ -432,6 +432,29 @@ enum omap_dss_clk_source dss_get_lcd_clk_source(enum omap_channel channel) 
	}

}



/* calculate clock rates using dividers in cinfo */

int dss_calc_clock_rates(struct dss_clock_info *cinfo)

{

	if (dss.dpll4_m4_ck) {

		unsigned long prate;



		if (cinfo->fck_div > dss.feat->fck_div_max ||

				cinfo->fck_div == 0)

			return -EINVAL;



		prate = clk_get_rate(clk_get_parent(dss.dpll4_m4_ck));



		cinfo->fck = prate / cinfo->fck_div *

			dss.feat->dss_fck_multiplier;

	} else {

		if (cinfo->fck_div != 0)

			return -EINVAL;

		cinfo->fck = clk_get_rate(dss.dss_clk);

	}



	return 0;

}



int dss_set_clock_div(struct dss_clock_info *cinfo)

{

	if (dss.dpll4_m4_ck) {

drivers/video/omap2/dss/dss.h

+1 −0
Original line number Diff line number Diff line
@@ -296,6 +296,7 @@ void dss_set_venc_output(enum omap_dss_venc_type type); 
void dss_set_dac_pwrdn_bgz(bool enable);



unsigned long dss_get_dpll4_rate(void);

int dss_calc_clock_rates(struct dss_clock_info *cinfo);

int dss_set_clock_div(struct dss_clock_info *cinfo);

int dss_calc_clock_div(unsigned long req_pck, struct dss_clock_info *dss_cinfo,

		struct dispc_clock_info *dispc_cinfo);