diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-10-22 09:45:05 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-10-22 19:31:57 +0200 |
| commit | d8eccfd51debb0b3751e0512d3c61751705caf01 (patch) | |
| tree | e450675951414a2944a83b5c54e415d60c16e6d9 /drivers | |
| parent | 5b7a74d7494464a7a5ced34b90e3bdeccdd86695 (diff) | |
| download | barebox-d8eccfd51debb0b3751e0512d3c61751705caf01.tar.gz barebox-d8eccfd51debb0b3751e0512d3c61751705caf01.tar.xz | |
fb: i.MX IPU: fold mx3fb_set_par into its only user
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/imx-ipu-fb.c | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/drivers/video/imx-ipu-fb.c b/drivers/video/imx-ipu-fb.c index 08036aa353..c38082d6c6 100644 --- a/drivers/video/imx-ipu-fb.c +++ b/drivers/video/imx-ipu-fb.c @@ -722,31 +722,11 @@ static void sdc_enable_channel(struct ipu_fb_info *fbi, void *fbmem) mdelay(2); } -/* - * mx3fb_set_par() - set framebuffer parameters and change the operating mode. - * @return: 0 on success or negative error code on failure. - */ -static int mx3fb_set_par(struct fb_info *info) -{ - struct ipu_fb_info *fbi = info->priv; - struct fb_videomode *mode = info->mode; - int ret; - - ret = sdc_init_panel(info, IPU_PIX_FMT_RGB666); - if (ret < 0) - return ret; - - reg_write(fbi, (mode->left_margin << 16) | mode->upper_margin, - SDC_BG_POS); - - return 0; -} - /* References in this function refer to respective Linux kernel sources */ static void ipu_fb_enable(struct fb_info *info) { struct ipu_fb_info *fbi = info->priv; - + struct fb_videomode *mode = info->mode; u32 reg; /* pcm037.c::mxc_board_init() */ @@ -799,7 +779,10 @@ static void ipu_fb_enable(struct fb_info *info) ~(SDC_COM_GWSEL | SDC_COM_KEY_COLOR_G); reg_write(fbi, reg, SDC_COM_CONF); - mx3fb_set_par(info); + sdc_init_panel(info, IPU_PIX_FMT_RGB666); + + reg_write(fbi, (mode->left_margin << 16) | mode->upper_margin, + SDC_BG_POS); sdc_enable_channel(fbi, info->screen_base); |