Merge git://git.denx.de/u-boot-spi

[u-boot] / board / compulab / common / omap3_display.c

diff --git a/board/compulab/common/omap3_display.c b/board/compulab/common/omap3_display.c
index ead821eeb7c4928e51003f9255ec77d461f6c244..ed2077e3617904c32f1d49cc09a52292df5015a9 100644 (file)
--- a/board/compulab/common/omap3_display.c
+++ b/board/compulab/common/omap3_display.c
@@ -14,6 +14,7 @@
 #include <stdio_dev.h>
 #include <asm/arch/dss.h>
 #include <lcd.h>
+#include <scf0403_lcd.h>
 #include <asm/arch-omap3/dss.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -22,6 +23,7 @@ enum display_type {
        NONE,
        DVI,
        DVI_CUSTOM,
+       DATA_IMAGE, /* #define CONFIG_SCF0403_LCD to use */
 };
 
 #define CMAP_ADDR      0x80100000
@@ -119,6 +121,18 @@ static const struct panel_config preset_dvi_1280X1024 = {
        .gfx_format     = GFXFORMAT_RGB16,
 };
 
+static const struct panel_config preset_dataimage_480X800 = {
+       .lcd_size       = PANEL_LCD_SIZE(480, 800),
+       .timing_h       = DSS_HBP(2) | DSS_HFP(2) | DSS_HSW(2),
+       .timing_v       = DSS_VBP(17) | DSS_VFP(20) | DSS_VSW(3),
+       .pol_freq       = DSS_IVS | DSS_IHS | DSS_IPC | DSS_ONOFF,
+       .divisor        = 10 | (1 << 10),
+       .data_lines     = LCD_INTERFACE_18_BIT,
+       .panel_type     = ACTIVE_DISPLAY,
+       .load_mode      = 2,
+       .gfx_format     = GFXFORMAT_RGB16,
+};
+
 /*
  * set_resolution_params()
  *
@@ -146,6 +160,13 @@ static enum display_type set_dvi_preset(const struct panel_config preset,
        return DVI;
 }
 
+static enum display_type set_dataimage_preset(const struct panel_config preset,
+               int x_res, int y_res)
+{
+       set_preset(preset, x_res, y_res);
+       return DATA_IMAGE;
+}
+
 /*
  * parse_mode() - parse the mode parameter of custom lcd settings
  *
@@ -369,6 +390,8 @@ static enum display_type env_parse_displaytype(char *displaytype)
                return set_dvi_preset(preset_dvi_1280X960, 1280, 960);
        else if (!strncmp(displaytype, "dvi1280x1024", 12))
                return set_dvi_preset(preset_dvi_1280X1024, 1280, 1024);
+       else if (!strncmp(displaytype, "dataimage480x800", 16))
+               return set_dataimage_preset(preset_dataimage_480X800, 480, 800);
 
        return NONE;
 }
@@ -377,7 +400,7 @@ void lcd_ctrl_init(void *lcdbase)
 {
        struct prcm *prcm = (struct prcm *)PRCM_BASE;
        char *custom_lcd;
-       char *displaytype = getenv("displaytype");
+       char *displaytype = env_get("displaytype");
 
        if (displaytype == NULL)
                return;
@@ -385,7 +408,7 @@ void lcd_ctrl_init(void *lcdbase)
        lcd_def = env_parse_displaytype(displaytype);
        /* If we did not recognize the preset, check if it's an env variable */
        if (lcd_def == NONE) {
-               custom_lcd = getenv(displaytype);
+               custom_lcd = env_get(displaytype);
                if (custom_lcd == NULL || parse_customlcd(custom_lcd) < 0)
                        return;
        }
@@ -401,12 +424,31 @@ void lcd_ctrl_init(void *lcdbase)
        clrsetbits_le32(&prcm->clksel_dss, 0xF, 3);
 }
 
+#ifdef CONFIG_SCF0403_LCD
+static void scf0403_enable(void)
+{
+       gpio_direction_output(58, 1);
+       scf0403_init(157);
+}
+#else
+static inline void scf0403_enable(void) {}
+#endif
+
 void lcd_enable(void)
 {
-       if (lcd_def == DVI || lcd_def == DVI_CUSTOM) {
+       switch (lcd_def) {
+       case NONE:
+               return;
+       case DVI:
+       case DVI_CUSTOM:
                gpio_direction_output(54, 0); /* Turn on DVI */
-               omap3_dss_enable();
+               break;
+       case DATA_IMAGE:
+               scf0403_enable();
+               break;
        }
+
+       omap3_dss_enable();
 }
 
 void lcd_setcolreg(ushort regno, ushort red, ushort green, ushort blue) {}