OMAP: DSS2: Fix build breaks for rfbi.c and dsi.c
PATCH 1/1 OMAP: DSS2: Fix build breaks for rfbi.c and dsi.c
The following patches caused compilation errors in rfbi.c and dsi.c:
OMAP: DSS2: Introduce omap_channel argument to DISPC functions used by interface drivers
OMAP: DSS2: Change remaining DISPC functions for new omap_channel argument
Signed-off-by Archit Taneja <[email protected]>
--- drivers/video/omap2/dss/dsi.c | 2 +- drivers/video/omap2/dss/dss.h | 2 +- drivers/video/omap2/dss/rfbi.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/video/omap2/dss/dsi.c +1 -1
@@ -2990,7 +2990,7 @@ static int dsi_configure_dsi_clocks(struct omap_dss_device *dssdev) cinfo.regm = dssdev->phy.dsi.div.regm; cinfo.regm3 = dssdev->phy.dsi.div.regm3; cinfo.regm4 = dssdev->phy.dsi.div.regm4; - r =dsi_calc_clock_rates (&cinfo); + r =dsi_calc_clock_rates (dssdev, &cinfo);if (r) {DSSERR ("Failed to calc dsi clocks\n" );return r;
drivers/video/omap2/dss/dss.h +1 -1
@@ -431,7 +431,7 @@ void rfbi_dump_regs(struct seq_file *s);int rfbi_configure (int rfbi_module,int bpp,int lines);void rfbi_enable_rfbi (bool enable); -void rfbi_transfer_area (omap_dss_device *dssdev,u16 width, +void rfbi_transfer_area (struct omap_dss_device *dssdev,u16 width,u16 height,void (callback )(void *data),void *data);void rfbi_set_timings (int rfbi_module,struct rfbi_timings *t);unsigned long rfbi_get_max_tx_rate (void );
drivers/video/omap2/dss/rfbi.c +1 -1
@@ -301,7 +301,7 @@ void omap_rfbi_write_pixels(const void __iomem *buf, int scr_width, }EXPORT_SYMBOL (omap_rfbi_write_pixels); -void rfbi_transfer_area (omap_dss_device *dssdev,u16 width, +void rfbi_transfer_area (struct omap_dss_device *dssdev,u16 width,u16 height,void (*callback)(void *data),void *data) {u32 l;
Signature · 1 line
1.7.0.4
Quoted 5 lines · ext Archit Taneja
The following patches caused compilation errors in
rfbi.canddsi.c:
OMAP: DSS2: Introduceomap_channelargument to DISPC functions used by interface drivers
OMAP: DSS2: Change remaining DISPC functions for newomap_channelargumentSigned-off-by Archit Taneja <[email protected]>
Thanks, looks fine.
Tomi
Quoted 45 lines
--- drivers/video/omap2/dss/dsi.c | 2 +- drivers/video/omap2/dss/dss.h | 2 +- drivers/video/omap2/dss/rfbi.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)drivers/video/omap2/dss/dsi.c +1
-1@@ -2990,7 +2990,7 @@ static int dsi_configure_dsi_clocks(struct omap_dss_device *dssdev) cinfo.regm = dssdev->phy.dsi.div.regm; cinfo.regm3 = dssdev->phy.dsi.div.regm3; cinfo.regm4 = dssdev->phy.dsi.div.regm4; - r =dsi_calc_clock_rates (&cinfo); + r =dsi_calc_clock_rates (dssdev, &cinfo);if (r) {DSSERR ("Failed to calc dsi clocks\n" );return r;drivers/video/omap2/dss/dss.h +1
-1@@ -431,7 +431,7 @@ void rfbi_dump_regs(struct seq_file *s);int rfbi_configure (int rfbi_module,int bpp,int lines);void rfbi_enable_rfbi (bool enable); -void rfbi_transfer_area (omap_dss_device *dssdev,u16 width, +void rfbi_transfer_area (struct omap_dss_device *dssdev,u16 width,u16 height,void (callback )(void *data),void *data);void rfbi_set_timings (int rfbi_module,struct rfbi_timings *t);unsigned long rfbi_get_max_tx_rate (void );drivers/video/omap2/dss/rfbi.c +1
-1@@ -301,7 +301,7 @@ void omap_rfbi_write_pixels(const void __iomem *buf, int scr_width, }EXPORT_SYMBOL (omap_rfbi_write_pixels); -void rfbi_transfer_area (omap_dss_device *dssdev,u16 width, +void rfbi_transfer_area (struct omap_dss_device *dssdev,u16 width,u16 height,void (*callback)(void *data),void *data) {u32 l;