diff options
author | Jason Chen <b02280@freescale.com> | 2010-11-23 13:56:48 +0800 |
---|---|---|
committer | Justin Waters <justin.waters@timesys.com> | 2010-12-14 10:44:21 -0500 |
commit | c2bddd10d78db5acc7f53618fc458978cbe49d02 (patch) | |
tree | 143c5a8a262f2da7940963dc8d356b27cb8b6309 | |
parent | 7e5ffcdb9f59ec09d298c32f3e1a4a5da6e8cdcb (diff) |
ENGR00133954-1 MSL: remove FB_SYNC_EXT flag
FB_SYNC_EXT was used to represent ext clk, but actually, it represent ext sync.
Some applications do not recognize it, during fb_set_var ioctl may miss it,
which will cause fb display fail, for example X window startup.
Remove FB_SYNC_EXT flag, and choose ext clk support by ipu driver.
Signed-off-by: Jason Chen <b02280@freescale.com>
-rw-r--r-- | arch/arm/mach-mx5/mx51_babbage.c | 7 | ||||
-rw-r--r-- | arch/arm/mach-mx5/mx53_ard.c | 14 | ||||
-rw-r--r-- | arch/arm/mach-mx5/mx53_evk.c | 43 |
3 files changed, 22 insertions, 42 deletions
diff --git a/arch/arm/mach-mx5/mx51_babbage.c b/arch/arm/mach-mx5/mx51_babbage.c index 38aaace7be92..fff223368ee9 100644 --- a/arch/arm/mach-mx5/mx51_babbage.c +++ b/arch/arm/mach-mx5/mx51_babbage.c @@ -273,7 +273,7 @@ static struct fb_videomode video_modes[] = { 122, 15, 18, 26, 1, 1, - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT | FB_SYNC_EXT, + FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_INTERLACED, 0,}, { @@ -282,7 +282,7 @@ static struct fb_videomode video_modes[] = { 132, 11, 22, 26, 1, 1, - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT | FB_SYNC_EXT, + FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_INTERLACED | FB_VMODE_ODD_FLD_FIRST, 0,}, { @@ -291,8 +291,7 @@ static struct fb_videomode video_modes[] = { 260, 109, 25, 4, 1, 1, - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT | - FB_SYNC_EXT, + FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, 0,}, { diff --git a/arch/arm/mach-mx5/mx53_ard.c b/arch/arm/mach-mx5/mx53_ard.c index c91e10a8eadf..26e5b80b796f 100644 --- a/arch/arm/mach-mx5/mx53_ard.c +++ b/arch/arm/mach-mx5/mx53_ard.c @@ -400,7 +400,7 @@ static struct fb_videomode video_modes[] = { 122, 15, 18, 26, 1, 1, - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT | FB_SYNC_EXT, + FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_INTERLACED, 0,}, { @@ -409,7 +409,7 @@ static struct fb_videomode video_modes[] = { 132, 11, 22, 26, 1, 1, - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT | FB_SYNC_EXT, + FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_INTERLACED | FB_VMODE_ODD_FLD_FIRST, 0,}, { @@ -417,8 +417,7 @@ static struct fb_videomode video_modes[] = { 260, 109, 25, 4, 1, 1, - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT | - FB_SYNC_EXT, + FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, 0,}, { @@ -433,8 +432,7 @@ static struct fb_videomode video_modes[] = { 304, 64, 1, 46, 192, 3, - FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT | - FB_SYNC_EXT, + FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, 0,}, { @@ -442,7 +440,7 @@ static struct fb_videomode video_modes[] = { 100, 40, 30, 3, 10, 2, - FB_SYNC_EXT, + 0, FB_VMODE_NONINTERLACED, 0,}, { @@ -450,7 +448,7 @@ static struct fb_videomode video_modes[] = { 220, 40, 21, 7, 60, 10, - FB_SYNC_EXT, + 0, FB_VMODE_NONINTERLACED, 0,}, }; diff --git a/arch/arm/mach-mx5/mx53_evk.c b/arch/arm/mach-mx5/mx53_evk.c index 5ea882ef4adb..698c9cd08a8c 100644 --- a/arch/arm/mach-mx5/mx53_evk.c +++ b/arch/arm/mach-mx5/mx53_evk.c @@ -436,7 +436,7 @@ static struct fb_videomode video_modes[] = { 122, 15, 18, 26, 1, 1, - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT | FB_SYNC_EXT, + FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_INTERLACED, 0,}, { @@ -445,7 +445,7 @@ static struct fb_videomode video_modes[] = { 132, 11, 22, 26, 1, 1, - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT | FB_SYNC_EXT, + FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_INTERLACED | FB_VMODE_ODD_FLD_FIRST, 0,}, { @@ -454,8 +454,7 @@ static struct fb_videomode video_modes[] = { 148, 528, 36, 4, 44, 5, - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT | - FB_SYNC_EXT, + FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_INTERLACED, 0,}, { @@ -464,8 +463,7 @@ static struct fb_videomode video_modes[] = { 148, 88, 36, 4, 44, 5, - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT | - FB_SYNC_EXT, + FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_INTERLACED, 0,}, { @@ -475,20 +473,11 @@ static struct fb_videomode video_modes[] = { FB_VMODE_NONINTERLACED, 0,}, { - /* VGA 1024x768 65M pixel clk output */ - "VGA-XGA", 60, 1024, 768, 15384, - 24, 160, - 3, 29, - 136, 6, - FB_SYNC_EXT, - FB_VMODE_NONINTERLACED, - 0,}, - { "XGA", 60, 1024, 768, 15385, 220, 40, 21, 7, 60, 10, - FB_SYNC_EXT, + 0, FB_VMODE_NONINTERLACED, 0,}, { @@ -497,8 +486,7 @@ static struct fb_videomode video_modes[] = { 256, 1760, 20, 5, 4, 5, - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT | - FB_SYNC_EXT, + FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, 0,}, { @@ -506,8 +494,7 @@ static struct fb_videomode video_modes[] = { 260, 109, 25, 4, 1, 1, - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT | - FB_SYNC_EXT, + FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, 0,}, { @@ -516,7 +503,7 @@ static struct fb_videomode video_modes[] = { 48, 248, 1, 38, 112, 3, - FB_SYNC_EXT, + 0, FB_VMODE_NONINTERLACED, 0,}, { @@ -525,8 +512,7 @@ static struct fb_videomode video_modes[] = { 304, 64, 1, 46, 192, 3, - FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT | - FB_SYNC_EXT, + FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, 0,}, { @@ -535,8 +521,7 @@ static struct fb_videomode video_modes[] = { 148, 638, 36, 4, 44, 5, - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT | - FB_SYNC_EXT, + FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, 0,}, { @@ -545,8 +530,7 @@ static struct fb_videomode video_modes[] = { 148, 528, 36, 4, 44, 5, - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT | - FB_SYNC_EXT, + FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, 0,}, { @@ -555,8 +539,7 @@ static struct fb_videomode video_modes[] = { 148, 88, 36, 4, 44, 5, - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT | - FB_SYNC_EXT, + FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, 0,}, { @@ -564,7 +547,7 @@ static struct fb_videomode video_modes[] = { 100, 40, 30, 3, 10, 2, - FB_SYNC_EXT, + 0, FB_VMODE_NONINTERLACED, 0,}, }; |