summaryrefslogtreecommitdiff
path: root/board/ttcontrol
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-10-17 21:48:20 +0200
committerWolfgang Denk <wd@denx.de>2011-10-17 21:48:20 +0200
commit10d1a160f5e28b05f891c050ca2f23855b226f5f (patch)
tree3858d272e390350bf0f9dd07847f8ce7c38d7d52 /board/ttcontrol
parent92faa8b109180fa28ec899479f676e62a3a391b7 (diff)
parent62a22dca32b988cce5d1908e8ac9fadb139bb3e8 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-video
* 'master' of git://git.denx.de/u-boot-video: video: Moving mx3fb.c to CONFIG_VIDEO mx31: make HSP clock for mx3fb driver available MX5: Make IPU display output and pixel format configurable VIDEO: MX5: export pix format VIDEO: MX5: Switch MX5 to CONFIG_VIDEO video: update the Freescale DIU driver to use linux/fb.h
Diffstat (limited to 'board/ttcontrol')
-rw-r--r--board/ttcontrol/vision2/vision2.c40
1 files changed, 23 insertions, 17 deletions
diff --git a/board/ttcontrol/vision2/vision2.c b/board/ttcontrol/vision2/vision2.c
index ebca7b6f36..e496f64312 100644
--- a/board/ttcontrol/vision2/vision2.c
+++ b/board/ttcontrol/vision2/vision2.c
@@ -39,12 +39,12 @@
#include <mc13892.h>
#include <linux/fb.h>
+#include <ipu_pixfmt.h>
+
DECLARE_GLOBAL_DATA_PTR;
static u32 system_rev;
-extern int mx51_fb_init(struct fb_videomode *mode);
-
static struct fb_videomode nec_nl6448bc26_09c = {
"NEC_NL6448BC26-09C",
60, /* Refresh */
@@ -600,6 +600,21 @@ int board_mmc_init(bd_t *bis)
}
#endif
+void lcd_enable(void)
+{
+ int ret;
+
+ mxc_request_iomux(MX51_PIN_DI1_PIN2, IOMUX_CONFIG_ALT0);
+ mxc_request_iomux(MX51_PIN_DI1_PIN3, IOMUX_CONFIG_ALT0);
+
+ gpio_set_value(2, 1);
+ mxc_request_iomux(MX51_PIN_GPIO1_2, IOMUX_CONFIG_ALT0);
+
+ ret = mx51_fb_init(&nec_nl6448bc26_09c, 0, IPU_PIX_FMT_RGB666);
+ if (ret)
+ puts("LCD cannot be configured\n");
+}
+
int board_early_init_f(void)
{
@@ -636,26 +651,15 @@ static void backlight(int on)
}
}
-void lcd_enable(void)
-{
- int ret;
-
- mxc_request_iomux(MX51_PIN_DI1_PIN2, IOMUX_CONFIG_ALT0);
- mxc_request_iomux(MX51_PIN_DI1_PIN3, IOMUX_CONFIG_ALT0);
-
- gpio_set_value(2, 1);
- mxc_request_iomux(MX51_PIN_GPIO1_2, IOMUX_CONFIG_ALT0);
-
- ret = mx51_fb_init(&nec_nl6448bc26_09c);
- if (ret)
- puts("LCD cannot be configured\n");
-}
-
int board_init(void)
{
/* address of boot parameters */
gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
+ lcd_enable();
+
+ backlight(1);
+
return 0;
}
@@ -676,6 +680,8 @@ int board_late_init(void)
udelay(2000);
#endif
+ setenv("stdout", "serial");
+
return 0;
}