diff options
| author | Justin Waters <justin.waters@timesys.com> | 2013-05-31 10:38:32 -0400 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2013-05-31 10:38:32 -0400 |
| commit | 29df0a85f8b10b7011a25f37f00a319c1fde07cb (patch) | |
| tree | 0f4568cc4f1cb6a30c440c02cce84625c1e6766f | |
| parent | b1c4a87b038bc4aff5c38a17e50975a873e6ee1f (diff) | |
shiratech: Add support for 16bpp screen2012.10-shiratech-ts1
| -rw-r--r-- | drivers/video/atmel_hlcdfb.c | 4 | ||||
| -rw-r--r-- | drivers/video/atmel_lcdfb.c | 10 | ||||
| -rw-r--r-- | include/configs/at91sama5ek.h | 8 |
3 files changed, 16 insertions, 6 deletions
diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c index beb7fa396ea..50f82e0c489 100644 --- a/drivers/video/atmel_hlcdfb.c +++ b/drivers/video/atmel_hlcdfb.c @@ -53,6 +53,7 @@ short console_row; void lcd_ctrl_init(void *lcdbase) { + printf("Entered ATMEL_HLCD_Controler lcd_ctrl_init-function"); unsigned long value; struct lcd_dma_desc *desc; struct atmel_hlcd_regs *regs; @@ -111,8 +112,9 @@ void lcd_ctrl_init(void *lcdbase) value |= panel_info.vl_sync; #ifndef LCD_OUTPUT_BPP + printf("Entered ATMEL_HLCD_Controler LCD_OUTPUT_BPP"); /* Output is 24bpp */ - value |= LCDC_LCDCFG5_MODE_OUTPUT_24BPP; + value |= LCDC_LCDCFG5_MODE_OUTPUT_16BPP; #else switch (LCD_OUTPUT_BPP) { case 12: diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index 860cbcc4d2e..3e5b09371a9 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c @@ -72,6 +72,8 @@ void lcd_setcolreg(ushort regno, ushort red, ushort green, ushort blue) #if defined(CONFIG_AT91SAM9X5) || defined(CONFIG_AT91SAMA5) void lcd_9x5_ctrl_init(void *lcdbase) { + printf("Entered lcd_9x5_ctrl_init(atmel_lcd_fb.c)"); + unsigned long value; lcd_dma_desc *desc; @@ -133,22 +135,28 @@ void lcd_9x5_ctrl_init(void *lcdbase) #ifndef LCD_OUTPUT_BPP /* Output is 24bpp */ - value |= LCDC_LCDCFG5_MODE_OUTPUT_24BPP; + printf("Entered LCD_OUTPUT_BPP LCD_FB"); + value |= LCDC_LCDCFG5_MODE_OUTPUT_16BPP; #else switch (LCD_OUTPUT_BPP) { case 12: + printf("Entered LCD_OUTPUT_BPP 12BPP"); value |= LCDC_LCDCFG5_MODE_OUTPUT_12BPP; break; case 16: + printf("Entered LCD_OUTPUT_BPP 16BPP"); value |= LCDC_LCDCFG5_MODE_OUTPUT_16BPP; break; case 18: + printf("Entered LCD_OUTPUT_BPP 18BPP"); value |= LCDC_LCDCFG5_MODE_OUTPUT_18BPP; break; case 24: + printf("Entered LCD_OUTPUT_BPP 24BPP"); value |= LCDC_LCDCFG5_MODE_OUTPUT_24BPP; break; default: + printf("Entered LCD_OUTPUT_BPP BUG"); BUG(); break; } diff --git a/include/configs/at91sama5ek.h b/include/configs/at91sama5ek.h index 842bd1e2f9f..92bbfbf012e 100644 --- a/include/configs/at91sama5ek.h +++ b/include/configs/at91sama5ek.h @@ -41,9 +41,9 @@ #define CONFIG_ARCH_CPU_INIT #undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */ -#undef CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#undef CONFIG_SETUP_MEMORY_TAGS -#undef CONFIG_INITRD_TAG +#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG #define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_DISPLAY_CPUINFO @@ -80,7 +80,7 @@ /* LCD */ #define CONFIG_LCD #define LCD_BPP LCD_COLOR16 -#define LCD_OUTPUT_BPP 24 +#define LCD_OUTPUT_BPP 16 #define CONFIG_LCD_LOGO #undef LCD_TEST_PATTERN #define CONFIG_LCD_INFO |