summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/mxc/mxc_hdmi.c24
1 files changed, 1 insertions, 23 deletions
diff --git a/drivers/video/mxc/mxc_hdmi.c b/drivers/video/mxc/mxc_hdmi.c
index cbf6b856bbc6..bf20720d1452 100644
--- a/drivers/video/mxc/mxc_hdmi.c
+++ b/drivers/video/mxc/mxc_hdmi.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2013 Freescale Semiconductor, Inc.
+ * Copyright (C) 2011-2014 Freescale Semiconductor, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -99,19 +99,6 @@ static const struct fb_videomode vga_mode = {
FB_VMODE_NONINTERLACED | FB_VMODE_ASPECT_4_3, FB_MODE_IS_VESA,
};
-static const struct fb_videomode xga_mode = {
- /* 13 1024x768-60 VESA */
- NULL, 60, 1024, 768, 15384, 160, 24, 29, 3, 136, 6,
- 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA
-};
-
-static const struct fb_videomode sxga_mode = {
- /* 20 1280x1024-60 VESA */
- NULL, 60, 1280, 1024, 9259, 248, 48, 38, 1, 112, 3,
- FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
- FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA
-};
-
enum hdmi_datamap {
RGB444_8B = 0x01,
RGB444_10B = 0x03,
@@ -1852,11 +1839,6 @@ static void mxc_hdmi_default_modelist(struct mxc_hdmi *hdmi)
fb_destroy_modelist(&hdmi->fbi->modelist);
- /*Add XGA and SXGA to default modelist */
- fb_add_videomode(&vga_mode, &hdmi->fbi->modelist);
- fb_add_videomode(&xga_mode, &hdmi->fbi->modelist);
- fb_add_videomode(&sxga_mode, &hdmi->fbi->modelist);
-
/*Add all no interlaced CEA mode to default modelist */
for (i = 0; i < ARRAY_SIZE(mxc_cea_mode); i++) {
mode = &mxc_cea_mode[i];
@@ -2577,10 +2559,6 @@ static int mxc_hdmi_disp_init(struct mxc_dispdrv_handle *disp,
fb_add_videomode(mode, &hdmi->fbi->modelist);
}
- /*Add XGA and SXGA to default modelist */
- fb_add_videomode(&xga_mode, &hdmi->fbi->modelist);
- fb_add_videomode(&sxga_mode, &hdmi->fbi->modelist);
-
console_unlock();
/* Find a nearest mode in default modelist */