diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-11-15 06:20:02 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-11-27 05:27:02 -0500 |
commit | 251886d8bc6f565c14acb34b12c007b994c2e56d (patch) | |
tree | 972c2ea0dcd3af64427e694d75335e0c7a09d179 /drivers/video/omap2 | |
parent | 3c91ee8cc9fa785ed9c4ad250d3f293f279153fe (diff) |
OMAPDSS: DISPC: pclk & lclk rates for writeback
Change the dispc_plane_pclk_rate and dispc_plane_lclk_rate functions to
return 0 if the given plane is the writeback plane. The clocks are not
valid for WB, but returning 0 from these functions instead of running
into BUG() will simplify the code that uses these functions.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2')
-rw-r--r-- | drivers/video/omap2/dss/dispc.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index 531961424d3..fff26fd5d17 100644 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c | |||
@@ -3232,14 +3232,24 @@ unsigned long dispc_core_clk_rate(void) | |||
3232 | 3232 | ||
3233 | static unsigned long dispc_plane_pclk_rate(enum omap_plane plane) | 3233 | static unsigned long dispc_plane_pclk_rate(enum omap_plane plane) |
3234 | { | 3234 | { |
3235 | enum omap_channel channel = dispc_ovl_get_channel_out(plane); | 3235 | enum omap_channel channel; |
3236 | |||
3237 | if (plane == OMAP_DSS_WB) | ||
3238 | return 0; | ||
3239 | |||
3240 | channel = dispc_ovl_get_channel_out(plane); | ||
3236 | 3241 | ||
3237 | return dispc_mgr_pclk_rate(channel); | 3242 | return dispc_mgr_pclk_rate(channel); |
3238 | } | 3243 | } |
3239 | 3244 | ||
3240 | static unsigned long dispc_plane_lclk_rate(enum omap_plane plane) | 3245 | static unsigned long dispc_plane_lclk_rate(enum omap_plane plane) |
3241 | { | 3246 | { |
3242 | enum omap_channel channel = dispc_ovl_get_channel_out(plane); | 3247 | enum omap_channel channel; |
3248 | |||
3249 | if (plane == OMAP_DSS_WB) | ||
3250 | return 0; | ||
3251 | |||
3252 | channel = dispc_ovl_get_channel_out(plane); | ||
3243 | 3253 | ||
3244 | return dispc_mgr_lclk_rate(channel); | 3254 | return dispc_mgr_lclk_rate(channel); |
3245 | } | 3255 | } |