diff options
| author | Steve Sakoman <steve@sakoman.com> | 2010-01-19 21:19:15 -0800 |
|---|---|---|
| committer | Jerome Glisse <jglisse@redhat.com> | 2013-07-28 14:05:29 -0400 |
| commit | 11656535f6e63300a1bd9c5b339b88af74f6f7c3 (patch) | |
| tree | 35937e78830ae41c1da6ecc98cbeefab2ce6f1cc | |
| parent | 80ed39591c2580a461dd572b52a7b9a00e3fdbbb (diff) | |
OMAP: DSS2: add bootarg for selecting svideo
OMAP: DSS2: add bootarg for selecting svideo or composite for tv output
also add pal-16 and ntsc-16 omapfb.mode settings for 16bpp
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
| -rw-r--r-- | drivers/video/omap2/dss/venc.c | 22 | ||||
| -rw-r--r-- | drivers/video/omap2/omapfb/omapfb-main.c | 10 |
2 files changed, 31 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c index 7152b53d14c0..6ab75d8bb141 100644 --- a/drivers/video/omap2/dss/venc.c +++ b/drivers/video/omap2/dss/venc.c @@ -87,6 +87,11 @@ #define VENC_OUTPUT_TEST 0xC8 #define VENC_DAC_B__DAC_C 0xC8 +static char *tv_connection; + +module_param_named(tvcable, tv_connection, charp, 0); +MODULE_PARM_DESC(tvcable, "TV connection type (svideo, composite)"); + struct venc_config { u32 f_control; u32 vidout_ctrl; @@ -474,6 +479,23 @@ static int venc_panel_probe(struct omap_dss_device *dssdev) { dssdev->panel.timings = omap_dss_pal_timings; + /* Allow the TV output to be overriden */ + if (tv_connection) { + if (strcmp(tv_connection, "svideo") == 0) { + printk(KERN_INFO + "omapdss: tv output is svideo.\n"); + dssdev->phy.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO; + } else if (strcmp(tv_connection, "composite") == 0) { + printk(KERN_INFO + "omapdss: tv output is composite.\n"); + dssdev->phy.venc.type = OMAP_DSS_VENC_TYPE_COMPOSITE; + } else { + printk(KERN_INFO + "omapdss: unsupported output type'%s'.\n", + tv_connection); + } + } + return 0; } diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c index f7c17534657e..efa6ff8f4b3f 100644 --- a/drivers/video/omap2/omapfb/omapfb-main.c +++ b/drivers/video/omap2/omapfb/omapfb-main.c @@ -2091,7 +2091,15 @@ static int omapfb_mode_to_timings(const char *mode_str, int r; #ifdef CONFIG_OMAP2_DSS_VENC - if (strcmp(mode_str, "pal") == 0) { + if (strcmp(mode_str, "pal-16") == 0) { + *timings = omap_dss_pal_timings; + *bpp = 16; + return 0; + } else if (strcmp(mode_str, "ntsc-16") == 0) { + *timings = omap_dss_ntsc_timings; + *bpp = 16; + return 0; + } else if (strcmp(mode_str, "pal") == 0) { *timings = omap_dss_pal_timings; *bpp = 24; return 0; |