imxfb: remove ifdefs
Subsystems (2)
PATCH 6/10 imxfb: remove ifdefs
From: Sascha Hauer <[email protected]>
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 <[email protected]>
Signed-off-by Antonino Daplas <[email protected]>
---
drivers/video/imxfb.c | 23 ++++++++--------------- 1 files changed, 8 insertions(+), 15 deletions(-)
drivers/video/imxfb.c +8 -15
@@ -394,26 +394,18 @@ static void imxfb_setup_gpio(struct imxf/* 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(stru 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;
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/