Commit 2e72972a authored by Jeroen Hofstee's avatar Jeroen Hofstee Committed by Anatolij Gustschin
Browse files

lcd, fb: remove duplicated prototypes and unused code



cc: Anatolij Gustschin <agust@denx.de>
cc: Cliff Brake <cliff.brake@gmail.com>
cc: John Zhan <zhanz@sinovee.com>
cc: Marek Vasut <marek.vasut@gmail.com>
cc: Wolfgang Denk <wd@denx.de>
Signed-off-by: default avatarJeroen Hofstee <jeroen@myspectrum.nl>
parent 6b035141
......@@ -74,13 +74,6 @@ vidinfo_t panel_info = {
*/
int serial_inited = 0;
/*
* Exported functions
*/
void lcd_initcolregs (void);
void lcd_ctrl_init (void *lcdbase);
void lcd_enable (void);
/*
* Imported functions to support the PSoC protocol
*/
......
......@@ -253,23 +253,6 @@ vidinfo_t panel_info = {
LCD_BPP, 0, 0, 0, 0, 33, 0, 0, 0
};
#endif
/*----------------------------------------------------------------------*/
void lcd_ctrl_init (void *lcdbase);
void lcd_enable (void);
#if LCD_BPP == LCD_COLOR8
void lcd_setcolreg (ushort regno,
ushort red, ushort green, ushort blue);
#endif
#if LCD_BPP == LCD_MONOCHROME
void lcd_initcolregs (void);
#endif
#if defined(CONFIG_RBC823)
void lcd_disable (void);
#endif
/************************************************************************/
/************************************************************************/
/* ----------------- chipset specific functions ----------------------- */
......@@ -415,29 +398,6 @@ void lcd_ctrl_init (void *lcdbase)
/*----------------------------------------------------------------------*/
#ifdef NOT_USED_SO_FAR
static void
lcd_getcolreg (ushort regno, ushort *red, ushort *green, ushort *blue)
{
volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR;
volatile cpm8xx_t *cp = &(immr->im_cpm);
unsigned short colreg, *cmap_ptr;
cmap_ptr = (unsigned short *)&cp->lcd_cmap[regno * 2];
colreg = *cmap_ptr;
#ifdef CONFIG_SYS_INVERT_COLORS
colreg ^= 0x0FFF;
#endif
*red = (colreg >> 8) & 0x0F;
*green = (colreg >> 4) & 0x0F;
*blue = colreg & 0x0F;
}
#endif /* NOT_USED_SO_FAR */
/*----------------------------------------------------------------------*/
#if LCD_BPP == LCD_COLOR8
void
lcd_setcolreg (ushort regno, ushort red, ushort green, ushort blue)
......
......@@ -317,26 +317,10 @@ vidinfo_t panel_info = {
/*----------------------------------------------------------------------*/
#if LCD_BPP == LCD_COLOR8
void lcd_setcolreg (ushort regno, ushort red, ushort green, ushort blue);
#endif
#if LCD_BPP == LCD_MONOCHROME
void lcd_initcolregs (void);
#endif
#ifdef NOT_USED_SO_FAR
void lcd_disable (void);
void lcd_getcolreg (ushort regno, ushort *red, ushort *green, ushort *blue);
#endif /* NOT_USED_SO_FAR */
void lcd_ctrl_init (void *lcdbase);
void lcd_enable (void);
static int pxafb_init_mem (void *lcdbase, vidinfo_t *vid);
static void pxafb_setup_gpio (vidinfo_t *vid);
static void pxafb_enable_controller (vidinfo_t *vid);
static int pxafb_init (vidinfo_t *vid);
/************************************************************************/
/************************************************************************/
/* --------------- PXA chipset specific functions ------------------- */
......@@ -350,14 +334,6 @@ void lcd_ctrl_init (void *lcdbase)
pxafb_enable_controller(&panel_info);
}
/*----------------------------------------------------------------------*/
#ifdef NOT_USED_SO_FAR
void
lcd_getcolreg (ushort regno, ushort *red, ushort *green, ushort *blue)
{
}
#endif /* NOT_USED_SO_FAR */
/*----------------------------------------------------------------------*/
#if LCD_BPP == LCD_COLOR8
void
......@@ -406,15 +382,6 @@ void lcd_enable (void)
{
}
/*----------------------------------------------------------------------*/
#ifdef NOT_USED_SO_FAR
static void lcd_disable (void)
{
}
#endif /* NOT_USED_SO_FAR */
/*----------------------------------------------------------------------*/
/************************************************************************/
/* ** PXA255 specific routines */
/************************************************************************/
......
Supports Markdown
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