summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPedro Perez de Heredia <pedro.perez@digi.com>2012-02-01 12:40:29 +0100
committerAlex Gonzalez <alex.gonzalez@digi.com>2012-02-01 13:57:26 +0100
commit2b437262092baa53210246a5a389b8fec49e562a (patch)
tree4067798967545087b371033330c65277ae4ed01c /arch
parent931818432f4f42d8ad006cf7ef3174750b4e4e37 (diff)
ccxmx53: add VGA resolution (640x480) to VGA interface (#41569)
Signed-off-by: Pedro Perez de Heredia <pedro.perez@digi.com> (cherry picked from commit f843b14a08a5f26ecd47ebcfde9110db1769723a)
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-mx5/devices_ccwmx53.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-mx5/devices_ccwmx53.c b/arch/arm/mach-mx5/devices_ccwmx53.c
index 21981e933b7d..e764164db3f0 100644
--- a/arch/arm/mach-mx5/devices_ccwmx53.c
+++ b/arch/arm/mach-mx5/devices_ccwmx53.c
@@ -792,7 +792,9 @@ int __init ccwmx5x_init_fb(void)
} else {
/* Pass the video configuration as mode string */
pr_info("VGA: string %s", p);
- if (!strcmp(p, "800x600")) {
+ if (!strcmp(p, "640x480")) {
+ strcpy(mx53_fb_data[i].mode_str, "VGA-VGA");
+ } else if (!strcmp(p, "800x600")) {
strcpy(mx53_fb_data[i].mode_str, "VGA-SVGA");
} else if (!strcmp(p, "1024x768")) {
strcpy(mx53_fb_data[i].mode_str, "VGA-XGA");