diff options
| author | Ran Ferderber <Ran.Ferderber@freescale.com> | 2010-11-25 16:54:39 +0200 |
|---|---|---|
| committer | Ran Ferderber <Ran.Ferderber@freescale.com> | 2010-11-30 08:58:47 +0200 |
| commit | 89d6eeb323002990ed28d723634ed2e277d8ed47 (patch) | |
| tree | 537049a5ad6cac8b95ac0f7e0e5eeaec6f3929bf /drivers | |
| parent | bbdbbe6e615e6df3a897c068366a046ffc7a8062 (diff) | |
ENGR00134077-2 Add TVE 1080P30/25/24, 1080I60/50 support for iMX53
Set the new video modes values
Signed-off-by: Ran Ferderber r53561@freescale.com
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mxc/ipu3/ipu_disp.c | 8 | ||||
| -rw-r--r-- | drivers/video/mxc/tve.c | 40 |
2 files changed, 24 insertions, 24 deletions
diff --git a/drivers/mxc/ipu3/ipu_disp.c b/drivers/mxc/ipu3/ipu_disp.c index 3a8ae498c0d4..56cd3d8efe14 100644 --- a/drivers/mxc/ipu3/ipu_disp.c +++ b/drivers/mxc/ipu3/ipu_disp.c @@ -1175,7 +1175,7 @@ int32_t ipu_init_sync_panel(int disp, uint32_t pixel_clk, DI_SYNC_NONE, /* CNT_POLARITY_CLR_SEL */ DI_SYNC_NONE, /* CNT_POLARITY_TRIGGER_SEL */ 0, /* COUNT UP */ - 4 /* COUNT DOWN */ + 2*div /* COUNT DOWN */ ); /* Setup internal HSYNC waveform */ @@ -1192,7 +1192,7 @@ int32_t ipu_init_sync_panel(int disp, uint32_t pixel_clk, DI_SYNC_NONE, /* CNT_POLARITY_CLR_SEL */ DI_SYNC_NONE, /* CNT_POLARITY_TRIGGER_SEL */ 0, /* COUNT UP */ - 4 /* COUNT DOWN */ + 2*div /* COUNT DOWN */ ); /* Active Field ? */ @@ -1281,7 +1281,7 @@ int32_t ipu_init_sync_panel(int disp, uint32_t pixel_clk, 0 /* COUNT DOWN */ ); - /* ??? */ + /* Second VSYNC */ _ipu_di_sync_config( disp, /* display */ 9, /* counter */ @@ -1295,7 +1295,7 @@ int32_t ipu_init_sync_panel(int disp, uint32_t pixel_clk, DI_SYNC_NONE, /* CNT_POLARITY_CLR_SEL */ DI_SYNC_NONE, /* CNT_POLARITY_TRIGGER_SEL */ 0, /* COUNT UP */ - 4 /* COUNT DOWN */ + 2*div /* COUNT DOWN */ ); /* set gentime select and tag sel */ diff --git a/drivers/video/mxc/tve.c b/drivers/video/mxc/tve.c index 41da2e841031..97f16d414be5 100644 --- a/drivers/video/mxc/tve.c +++ b/drivers/video/mxc/tve.c @@ -195,54 +195,54 @@ static struct fb_videomode video_modes[] = { { /* 720p30 TV output */ "720P30", 30, 1280, 720, 13468, - 256, 1760, - 20, 5, - 4, 5, + 260, 1759, + 25, 4, + 1, 1, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, 0,}, { /* 1080i60 TV output */ "1080I60", 60, 1920, 1080, 13468, - 148, 88, - 36, 4, - 44, 5, + 192, 87, + 20, 24, + 1, 1, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, - FB_VMODE_INTERLACED, + FB_VMODE_INTERLACED | FB_VMODE_ODD_FLD_FIRST, 0,}, { /* 1080i50 TV output */ "1080I50", 50, 1920, 1080, 13468, - 148, 528, - 36, 4, - 44, 5, + 192, 527, + 20, 24, + 1, 1, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, - FB_VMODE_INTERLACED, + FB_VMODE_INTERLACED | FB_VMODE_ODD_FLD_FIRST, 0,}, { /* 1080p30 TV output */ "1080P30", 30, 1920, 1080, 13468, - 148, 88, - 36, 4, - 44, 5, + 192, 87, + 38, 6, + 1, 1, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, 0,}, { /* 1080p25 TV output */ "1080P25", 25, 1920, 1080, 13468, - 148, 528, - 36, 4, - 44, 5, + 192, 527, + 38, 6, + 1, 1, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, 0,}, { /* 1080p24 TV output */ "1080P24", 24, 1920, 1080, 13468, - 148, 638, - 36, 4, - 44, 5, + 192, 637, + 38, 6, + 1, 1, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, 0,}, |