diff options
| author | Justin Waters <justin.waters@timesys.com> | 2008-05-28 15:14:51 -0400 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2008-05-28 15:14:51 -0400 |
| commit | afd6a91924a87203aae8b6561c147ad830811bb5 (patch) | |
| tree | 737b5af52a1ae0ad1c97113fe049cfd1559004b8 | |
| parent | f5bb85846029d4df438c61c9fe8dab69461ff9ee (diff) | |
MXCFB: Fix mode entry for Sharp 6.4" VGA display kit
The values for the 6.4" display kit were incorrect. This version is tested and
verified.
Signed-off-by: Justin Waters <justin.waters@timesys.com>
| -rw-r--r-- | arch/arm/mach-mx27/mx27lite.c | 2 | ||||
| -rw-r--r-- | drivers/video/mxc/mxcfb_modedb.c | 44 |
2 files changed, 30 insertions, 16 deletions
diff --git a/arch/arm/mach-mx27/mx27lite.c b/arch/arm/mach-mx27/mx27lite.c index 95c447de11de..3bafb14fbe9e 100644 --- a/arch/arm/mach-mx27/mx27lite.c +++ b/arch/arm/mach-mx27/mx27lite.c @@ -193,7 +193,7 @@ static void __init mxc_init_nand_mtd(void) * -------------------------------------------------------------------- */ #if defined(CONFIG_FB_MXC_SYNC_PANEL) || defined(CONFIG_FB_MXC_SYNC_PANEL_MODULE) -static const char fb_default_mode[] = "Sharp-QVGA"; +static const char fb_default_mode[] = "Sharp-VGA"; /* mxc lcd driver */ static struct platform_device mxc_fb_device = { diff --git a/drivers/video/mxc/mxcfb_modedb.c b/drivers/video/mxc/mxcfb_modedb.c index 03f5d5b802da..b932181bd01a 100644 --- a/drivers/video/mxc/mxcfb_modedb.c +++ b/drivers/video/mxc/mxcfb_modedb.c @@ -59,21 +59,35 @@ struct fb_videomode mxcfb_modedb[] = { 0, FB_VMODE_NONINTERLACED, 0, }, { - /* 640x480 @ 60 Hz */ - "Sharp-VGA", - 60, 640, 480, // 60 Hz, 640x480 - 35285, // 35.285 ns clock period - 128, 128, // left & right margin - 34, 10, // upper & lower margin - 2, 2, // hsync & vsync len - 0 - //| FB_SYNC_CLK_IDLE_EN - | FB_SYNC_OE_ACT_HIGH - //| FB_SYNC_HOR_HIGH_ACT - , - FB_VMODE_NONINTERLACED, - 0, - }, + /* 640x480 @ 60 Hz */ + "Sharp-VGA", + 60, 640, 480, // 60 Hz, 640x480 + 35285, // 35.285 ns clock period + 134, 34, // left & right margin + 30, 10, // upper & lower margin + 21, 5, // hsync & vsync len + 0 + | FB_SYNC_FLM_ACT_LOW + | FB_SYNC_LP_ACT_LOW + | FB_SYNC_CLK_POS_EDGE + , + FB_VMODE_NONINTERLACED, + 0, + }, + { + /* 800x600 @ 60 Hz */ + "Sharp-SVGA", + 60, 800, 600, // 60 Hz, 640x480 + 25000, // 25.000 ns clock period + 104, 104, // left & right margin + 28, 95, // upper & lower margin + 8, 4, // hsync & vsync len + 0 + | FB_SYNC_OE_ACT_HIGH + , + FB_VMODE_NONINTERLACED, + 0, + }, }; int mxcfb_modedb_sz = ARRAY_SIZE(mxcfb_modedb); |