Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / include / lcd.h

diff --git a/include/lcd.h b/include/lcd.h
index eadbb993fdc54c81842eb1bb57ff5233a8c02f49..c6e7fc5216330c6797e7c28a640a67322766a446 100644 (file)
--- a/include/lcd.h
+++ b/include/lcd.h
@@ -225,15 +225,6 @@ typedef struct vidinfo {
        u_char  vl_vbpd;        /* Wait end of frame */
        u_char  vl_cmd_allow_len; /* Wait end of frame */
 
-       void (*cfg_gpio)(void);
-       void (*backlight_on)(unsigned int onoff);
-       void (*reset_lcd)(void);
-       void (*lcd_power_on)(void);
-       void (*cfg_ldo)(void);
-       void (*enable_ldo)(unsigned int onoff);
-       void (*mipi_power)(void);
-       void (*backlight_reset)(void);
-
        unsigned int win_id;
        unsigned int init_delay;
        unsigned int power_on_delay;
@@ -420,34 +411,6 @@ int lcd_get_size(int *line_length);
 # define PAGE_SIZE     4096
 #endif
 
-/************************************************************************/
-/* ** CONSOLE DEFINITIONS & FUNCTIONS                                  */
-/************************************************************************/
-#if defined(CONFIG_LCD_LOGO) && !defined(CONFIG_LCD_INFO_BELOW_LOGO)
-# define CONSOLE_ROWS          ((panel_info.vl_row-BMP_LOGO_HEIGHT) \
-                                       / VIDEO_FONT_HEIGHT)
-#else
-# define CONSOLE_ROWS          (panel_info.vl_row / VIDEO_FONT_HEIGHT)
-#endif
-
-#define CONSOLE_COLS           (panel_info.vl_col / VIDEO_FONT_WIDTH)
-#define CONSOLE_ROW_SIZE       (VIDEO_FONT_HEIGHT * lcd_line_length)
-#define CONSOLE_ROW_FIRST      lcd_console_address
-#define CONSOLE_ROW_SECOND     (lcd_console_address + CONSOLE_ROW_SIZE)
-#define CONSOLE_ROW_LAST       (lcd_console_address + CONSOLE_SIZE \
-                                       - CONSOLE_ROW_SIZE)
-#define CONSOLE_SIZE           (CONSOLE_ROW_SIZE * CONSOLE_ROWS)
-#define CONSOLE_SCROLL_SIZE    (CONSOLE_SIZE - CONSOLE_ROW_SIZE)
-
-#if LCD_BPP == LCD_MONOCHROME
-# define COLOR_MASK(c)         ((c)      | (c) << 1 | (c) << 2 | (c) << 3 | \
-                                (c) << 4 | (c) << 5 | (c) << 6 | (c) << 7)
-#elif (LCD_BPP == LCD_COLOR8) || (LCD_BPP == LCD_COLOR16)
-# define COLOR_MASK(c)         (c)
-#else
-# error Unsupported LCD BPP.
-#endif
-
 /************************************************************************/
 
 #endif /* _LCD_H_ */