mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

imxfb: remove ifdefs 

Here are some small fixes for the imxfb framebuffer driver:

 - remove ifndef for MX1FS2 platform which is not present in the kernel.
 - REV, CLS, PS and SPL_SPR are only needed with some sharp displays.
   Only setup the corresponding io pins when such a display is connected.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Sascha Hauer 2007-05-23 13:57:51 -07:00 committed by Linus Torvalds
parent 92c4579dbb
commit 90e16dddec
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/video/imxfb.c
View File

@ -394,26 +394,18 @@ static void imxfb_setup_gpio(struct imxfb_info *fbi)
/* initialize GPIOs */
imx_gpio_mode(PD6_PF_LSCLK);
imx_gpio_mode(PD10_PF_SPL_SPR);
imx_gpio_mode(PD11_PF_CONTRAST);
imx_gpio_mode(PD14_PF_FLM_VSYNC);
imx_gpio_mode(PD13_PF_LP_HSYNC);
imx_gpio_mode(PD7_PF_REV);
imx_gpio_mode(PD8_PF_CLS);
#ifndef CONFIG_MACH_PIMX1
/* on PiMX1 used as buffers enable signal
*/
imx_gpio_mode(PD9_PF_PS);
#endif
#ifndef CONFIG_MACH_MX1FS2
/* on mx1fs2 this pin is used to (de)activate the display, so we need
* it as a normal gpio
*/
imx_gpio_mode(PD12_PF_ACD_OE);
#endif
/* These are only needed for Sharp HR TFT displays */
if (fbi->pcr & PCR_SHARP) {
imx_gpio_mode(PD7_PF_REV);
imx_gpio_mode(PD8_PF_CLS);
imx_gpio_mode(PD9_PF_PS);
imx_gpio_mode(PD10_PF_SPL_SPR);
}
}
#ifdef CONFIG_PM
@ -499,6 +491,7 @@ static int __init imxfb_init_fbinfo(struct device *dev)
info->var.sync = inf->sync;
info->var.grayscale = inf->cmap_greyscale;
fbi->cmap_inverse = inf->cmap_inverse;
fbi->cmap_static = inf->cmap_static;
fbi->pcr = inf->pcr;
fbi->lscr1 = inf->lscr1;
fbi->dmacr = inf->dmacr;