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

Commit ba1bc5bb authored by Chandrabhanu Mahapatra's avatar Chandrabhanu Mahapatra Committed by Tomi Valkeinen
Browse files

OMAPDSS: DSS: Remove redundant functions 



Functions dss_calc_clock_rates() and dss_get_clock_div() are removed as these
functions have become redundant and no longer used.

Signed-off-by: default avatarChandrabhanu Mahapatra <cmahapatra@ti.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent dcbe765b

drivers/video/omap2/dss/dss.c

+0 −45
Original line number Diff line number Diff line
@@ -431,31 +431,6 @@ 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;

		u16 fck_div_max = 16;



		if (cpu_is_omap3630() || cpu_is_omap44xx())

			fck_div_max = 32;



		if (cinfo->fck_div > 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;

	} 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) {
@@ -478,26 +453,6 @@ int dss_set_clock_div(struct dss_clock_info *cinfo) 
	return 0;

}



int dss_get_clock_div(struct dss_clock_info *cinfo)

{

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



	if (dss.dpll4_m4_ck) {

		unsigned long prate;



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



		if (cpu_is_omap3630() || cpu_is_omap44xx())

			cinfo->fck_div = prate / (cinfo->fck);

		else

			cinfo->fck_div = prate / (cinfo->fck / 2);

	} else {

		cinfo->fck_div = 0;

	}



	return 0;

}



unsigned long dss_get_dpll4_rate(void)

{

	if (dss.dpll4_m4_ck)

drivers/video/omap2/dss/dss.h

+0 −2
Original line number Diff line number Diff line
@@ -296,9 +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_get_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);