LCD support

diff --git a/board/pandora/Makefile b/board/pandora/Makefile
index b41e8a0..c30f9ce 100644 (file)
--- a/board/pandora/Makefile
+++ b/board/pandora/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(BOARD).a
 
-COBJS  := pandora.o
+COBJS  := pandora.o video.o
 
 SRCS   := $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS))

diff --git a/board/pandora/pandora.c b/board/pandora/pandora.c
index 3d97121..ed9e41b 100644 (file)
--- a/board/pandora/pandora.c
+++ b/board/pandora/pandora.c
@@ -37,6 +37,8 @@
 #include <asm/mach-types.h>
 #include "pandora.h"
 
+#define FRAMEBUFFER_ADDRESS 0x80598000
+
 /*
  * Routine: board_init
  * Description: Early hardware init.
@@ -50,6 +52,8 @@ int board_init(void)
        gd->bd->bi_arch_number = MACH_TYPE_OMAP3_PANDORA;
        /* boot param addr */
        gd->bd->bi_boot_params = (OMAP34XX_SDRC_CS0 + 0x100);
+       /* framebuffer base */
+       gd->fb_base = FRAMEBUFFER_ADDRESS;
 
        return 0;
 }

diff --git a/board/pandora/video.c b/board/pandora/video.c
new file mode 100644 (file)
index 0000000..bbe63e8
--- /dev/null
+++ b/board/pandora/video.c
@@ -0,0 +1,112 @@
+#include <common.h>
+#include <lcd.h>
+#include <twl4030.h>
+
+#ifdef CONFIG_LCD
+
+#define TWL_INTBR_PMBR1        0x92
+#define GPIODATADIR1   0x9b
+#define SETGPIODATAOUT1        0xa4
+
+/*
+ * Hacky DSS/LCD initialization code
+ */
+
+static void dss_lcd_init(uint base_addr)
+{
+       *((volatile uint *) 0x48004D44) = 0x0001b00c; /* DPLL4 multiplier/divider (CM_CLKSEL2_PLL) */
+       *((volatile uint *) 0x48004E40) = 0x0000100c; /* DSS clock divisors */
+       *((volatile uint *) 0x48004D00) = 0x00370037; /* control DPLL3/4 (CM_CLKEN_PLL) */
+
+       *((volatile uint *) 0x48050010) = 0x00000003;
+       while ( !(*((volatile uint *) 0x48050014) & 1) ); /* wait for reset to finish */
+
+       *((volatile uint *) 0x48050410) = 0x00002015;
+       *((volatile uint *) 0x48050444) = 0x00000004;
+       *((volatile uint *) 0x48050464) = 0x0d504300; /* horizontal timing */
+       *((volatile uint *) 0x48050468) = 0x02202700; /* vertical timing */
+       *((volatile uint *) 0x4805046c) = 0x00003000; /* polarities */
+
+       *((volatile uint *) 0x48050470) = 0x00010002;
+
+       *((volatile uint *) 0x4805047c) = 0x01df031f; /* display size */
+       *((volatile uint *) 0x48050480) = base_addr;
+       *((volatile uint *) 0x48050484) = base_addr;
+       *((volatile uint *) 0x4805048c) = 0x01df031f;
+       *((volatile uint *) 0x480504a0) = 0x0000008d;
+       *((volatile uint *) 0x480504a4) = 0x03c00200;
+
+       *((volatile uint *) 0x48050440) = 0x00018329;
+       while (*((volatile uint *) 0x48050440) & (1<<5)); /* wait for GOLCD */
+       *((volatile uint *) 0x48050440) = 0x00018329;
+}
+
+static void lcd_init(void)
+{
+       DECLARE_GLOBAL_DATA_PTR;
+       u8 d;
+
+       /* set VPLL2 to 1.8V */
+       twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, 0x05,
+                            TWL4030_PM_RECEIVER_VPLL2_DEDICATED);
+       twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, 0x20,
+                            TWL4030_PM_RECEIVER_VPLL2_DEV_GRP);
+
+       /* set VAUX1 to 3.0V (LCD) */
+       twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, 0x04,
+                            TWL4030_PM_RECEIVER_VAUX1_DEDICATED);
+       twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, 0x20,
+                            TWL4030_PM_RECEIVER_VAUX1_DEV_GRP);
+
+       /* Clear frame buffer */
+       //memset(gd->fb_base, 0, 800*480*2);
+       udelay(2000);
+
+       *((volatile uint *) 0x49056094) = 0x20000000; /* Bring LCD out of reset (157) */
+       udelay(2000); /* Need to wait at least 1ms after reset to start sending signals */
+
+       dss_lcd_init((uint)gd->fb_base);
+
+       /* Set GPIOs on T2 (Turn on LCD BL) */
+       twl4030_i2c_read_u8(TWL4030_CHIP_INTBR, &d, TWL_INTBR_PMBR1);
+       d &= ~0x0c; /* switch to GPIO function */
+       twl4030_i2c_write_u8(TWL4030_CHIP_INTBR, d, TWL_INTBR_PMBR1);
+
+       twl4030_i2c_read_u8(TWL4030_CHIP_GPIO, &d, GPIODATADIR1);
+       d |= 0x40; /* GPIO6 */
+       twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, d, GPIODATADIR1);
+       twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, 0x40, SETGPIODATAOUT1);
+}
+
+/* u-boot LCD driver support */
+vidinfo_t panel_info = {
+       800, 480, LCD_BPP
+};
+
+/* vars managed by lcd.c */
+int lcd_line_length;
+int lcd_color_fg;
+int lcd_color_bg;
+void *lcd_base;
+void *lcd_console_address;
+short console_col;
+short console_row;
+
+void lcd_enable(void)
+{
+}
+
+void lcd_ctrl_init(void *lcdbase)
+{
+       lcd_init();
+}
+
+/* Calculate fb size for VIDEOLFB_ATAG. */
+ulong calc_fbsize(void)
+{
+       return (panel_info.vl_col * panel_info.vl_row *
+               NBITS(panel_info.vl_bpix) / 8);
+}
+
+#endif /* CONFIG_LCD */
+

diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index 945c053..c44fabc 100644 (file)
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -61,6 +61,11 @@
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + (128 << 10))
 #define CONFIG_SYS_GBL_DATA_SIZE       128     /* bytes reserved for */
                                                /* initial data */
+/* LCD support */
+#define CONFIG_LCD                     1
+#define LCD_BPP                                LCD_COLOR16
+#define CONFIG_SYS_WHITE_ON_BLACK      1
+#define CONFIG_SYS_CONSOLE_IS_IN_ENV   1
 
 /*
  * Hardware drivers