summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2013-11-17 03:37:27 +0100
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2013-11-17 03:37:27 +0100
commitbbc452c42cc05fad1c79dcac8d4f929f28f6ebe6 (patch)
treed57855dce40d4d397a23eb52135cff40b836993e
parent936f114e0df6c417e8a40d42fa952f5c4a506b56 (diff)
colibri_vf50: mvf_dcu: use 16 bpp by default
Use 16 bpp colour mode by default to relieve memory bandwidth. While at it don't use hard-coded LCD enable pin.
-rw-r--r--arch/arm/mach-mvf/board-colibri_vf50.c4
-rw-r--r--drivers/video/mvf_dcu.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-mvf/board-colibri_vf50.c b/arch/arm/mach-mvf/board-colibri_vf50.c
index 7ad4141bd725..5ff7717a1d31 100644
--- a/arch/arm/mach-mvf/board-colibri_vf50.c
+++ b/arch/arm/mach-mvf/board-colibri_vf50.c
@@ -219,7 +219,7 @@ static iomux_v3_cfg_t mvf600_pads[] = {
//MVF600_PAD2_PTA9_GPIO, /* carefull also used for JTAG JTDI, may be used for RMII_CLKOUT */
//MVF600_PAD7_PTA17_GPIO,
-//MVF600_PAD38_PTB16_GPIO,
+//MVF600_PAD38_PTB16_GPIO, /* carefull also used as SW1_WAKEUP_PIN */
//MVF600_PAD39_PTB17_GPIO,
//MVF600_PAD40_PTB18_GPIO,
//MVF600_PAD41_PTB19_GPIO,
@@ -430,7 +430,7 @@ static struct platform_pwm_backlight_data colibri_vf50_backlight_data = {
static struct mvf_dcu_platform_data mvf_dcu_pdata = {
.mode_str = "640x480",
- .default_bpp = 24,
+ .default_bpp = 16,
};
static void __init fixup_mxc_board(struct machine_desc *desc, struct tag *tags,
diff --git a/drivers/video/mvf_dcu.c b/drivers/video/mvf_dcu.c
index 68d3b09d19ae..11399d15404a 100644
--- a/drivers/video/mvf_dcu.c
+++ b/drivers/video/mvf_dcu.c
@@ -1063,9 +1063,11 @@ static int __devinit mvf_dcu_probe(struct platform_device *pdev)
goto failed_get_resource;
}
+#if !defined(CONFIG_MACH_COLIBRI_VF50)
gpio_request_one(DCU_LCD_ENABLE_PIN, GPIOF_OUT_INIT_LOW, "DCU");
msleep(2);
gpio_set_value(DCU_LCD_ENABLE_PIN, 1);
+#endif
writel(0x20000000, MVF_IO_ADDRESS(MVF_TCON0_BASE_ADDR));