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

Commit c31cba8a authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAPDSS: DISPC: fix dispc_mgr_lclk_rate for DIGIT output 



dispc_mgr_lclk_rate() cannot currently be called with DIGIT channel
parameter, even if dispc_ovl_lclk_rate() can. Fix this by making
dispc_mgr_lclk_rate() handle DIGIT channel also.

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

drivers/video/omap2/dss/dispc.c

+25 −24
Original line number Diff line number Diff line
@@ -3167,6 +3167,7 @@ unsigned long dispc_mgr_lclk_rate(enum omap_channel channel) 
	unsigned long r;

	u32 l;



	if (dss_mgr_is_lcd(channel)) {

		l = dispc_read_reg(DISPC_DIVISORo(channel));



		lcd = FLD_GET(l, 23, 16);
@@ -3189,6 +3190,9 @@ unsigned long dispc_mgr_lclk_rate(enum omap_channel channel) 
		}



		return r / lcd;

	} else {

		return dispc_fclk_rate();

	}

}



unsigned long dispc_mgr_pclk_rate(enum omap_channel channel)
@@ -3247,12 +3251,9 @@ static unsigned long dispc_plane_lclk_rate(enum omap_plane plane) 
{

	enum omap_channel channel = dispc_ovl_get_channel_out(plane);



	if (dss_mgr_is_lcd(channel))

	return dispc_mgr_lclk_rate(channel);

	else

		return dispc_fclk_rate();



}



static void dispc_dump_clocks_channel(struct seq_file *s, enum omap_channel channel)

{

	int lcd, pcd;