Commit 90e16ddd authored by Sascha Hauer's avatar Sascha Hauer Committed by Linus Torvalds

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: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarAntonino Daplas <adaplas@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 92c4579d
......@@ -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(PD12_PF_ACD_OE);
/* 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);
#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
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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment