From 2aa9209ecd624a38621a9140f477902d75549006 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Wed, 3 Oct 2012 09:09:11 +0200 Subject: [PATCH] --- yaml --- r: 344579 b: refs/heads/master c: a8f3fcd1a274a4ddd4a81b0cdd968b3bdda2415c h: refs/heads/master i: 344577: 1a4de7fe6787a3ad484080d23269b316c8acf9e0 344575: 578532e32bc988c346489aeffecb44ac714c75c4 v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/dispc.c | 10 +++++----- trunk/drivers/video/omap2/dss/dss.h | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index a9d0646c9ede..0090f09a078c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d7b6b6b1e7490beba3f4a30d8a6f22947c263ffe +refs/heads/master: a8f3fcd1a274a4ddd4a81b0cdd968b3bdda2415c diff --git a/trunk/drivers/video/omap2/dss/dispc.c b/trunk/drivers/video/omap2/dss/dispc.c index a85228930b0d..31880618f0e6 100644 --- a/trunk/drivers/video/omap2/dss/dispc.c +++ b/trunk/drivers/video/omap2/dss/dispc.c @@ -1075,7 +1075,7 @@ static void dispc_mgr_enable_cpr(enum omap_channel channel, bool enable) } static void dispc_mgr_set_cpr_coef(enum omap_channel channel, - struct omap_dss_cpr_coefs *coefs) + const struct omap_dss_cpr_coefs *coefs) { u32 coef_r, coef_g, coef_b; @@ -2504,7 +2504,7 @@ int dispc_ovl_setup(enum omap_plane plane, const struct omap_overlay_info *oi, bool mem_to_mem) { int r; - struct omap_overlay *ovl = omap_dss_get_overlay(plane); + const struct omap_overlay *ovl = omap_dss_get_overlay(plane); enum omap_channel channel; channel = dispc_ovl_get_channel_out(plane); @@ -2841,7 +2841,7 @@ static void dispc_mgr_enable_alpha_fixed_zorder(enum omap_channel ch, } void dispc_mgr_setup(enum omap_channel channel, - struct omap_overlay_manager_info *info) + const struct omap_overlay_manager_info *info) { dispc_mgr_set_default_color(channel, info->default_color); dispc_mgr_set_trans_key(channel, info->trans_key_type, info->trans_key); @@ -3011,7 +3011,7 @@ static void _dispc_mgr_set_lcd_timings(enum omap_channel channel, int hsw, /* change name to mode? */ void dispc_mgr_set_timings(enum omap_channel channel, - struct omap_video_timings *timings) + const struct omap_video_timings *timings) { unsigned xtot, ytot; unsigned long ht, vt; @@ -3532,7 +3532,7 @@ int dispc_calc_clock_rates(unsigned long dispc_fclk_rate, } void dispc_mgr_set_clock_div(enum omap_channel channel, - struct dispc_clock_info *cinfo) + const struct dispc_clock_info *cinfo) { DSSDBG("lck = %lu (%u)\n", cinfo->lck, cinfo->lck_div); DSSDBG("pck = %lu (%u)\n", cinfo->pck, cinfo->pck_div); diff --git a/trunk/drivers/video/omap2/dss/dss.h b/trunk/drivers/video/omap2/dss/dss.h index 75f841a4a1e1..d1e7bea077a6 100644 --- a/trunk/drivers/video/omap2/dss/dss.h +++ b/trunk/drivers/video/omap2/dss/dss.h @@ -449,16 +449,16 @@ void dispc_mgr_enable_stallmode(enum omap_channel channel, bool enable); void dispc_mgr_set_tft_data_lines(enum omap_channel channel, u8 data_lines); void dispc_mgr_set_lcd_type_tft(enum omap_channel channel); void dispc_mgr_set_timings(enum omap_channel channel, - struct omap_video_timings *timings); + const struct omap_video_timings *timings); unsigned long dispc_mgr_lclk_rate(enum omap_channel channel); unsigned long dispc_mgr_pclk_rate(enum omap_channel channel); unsigned long dispc_core_clk_rate(void); void dispc_mgr_set_clock_div(enum omap_channel channel, - struct dispc_clock_info *cinfo); + const struct dispc_clock_info *cinfo); int dispc_mgr_get_clock_div(enum omap_channel channel, struct dispc_clock_info *cinfo); void dispc_mgr_setup(enum omap_channel channel, - struct omap_overlay_manager_info *info); + const struct omap_overlay_manager_info *info); u32 dispc_wb_get_framedone_irq(void); bool dispc_wb_go_busy(void);