RE: [PATCH 5/5] OMAP3EVM: Kconfig option added for selection between SVIDEO and CVBS

"Hiremath, Vaibhav" <[email protected]> Fri, 18 Dec 2009 09:43:37 +0530
Newsgroups gmane.linux.ports.arm.omap,gmane.linux.fbdev.devel
Message-ID <[email protected]>
> -----Original Message-----
> From: Randy Dunlap [mailto:[email protected]]
> Sent: Thursday, December 17, 2009 10:13 PM
> To: Hiremath, Vaibhav
> Cc: [email protected]; [email protected]; linux-
> [email protected]; [email protected]
> Subject: Re: [PATCH 5/5] OMAP3EVM: Kconfig option added for
> selection between SVIDEO and CVBS
> 
> On Thu, 17 Dec 2009 20:49:36 +0530 [email protected] wrote:
> 
> > From: Vaibhav Hiremath <[email protected]>
> >
> > Config option added to arch/arm/plat-omap/Kconfig for selection
> > of S-Video and Composite output interfaces. The default
> configuration would
> > be S-Video.
> >
> > Signed-off-by: Vaibhav Hiremath <[email protected]>
> > ---
> >  arch/arm/mach-omap2/board-omap3evm.c |    4 ++++
> >  drivers/video/omap2/dss/Kconfig      |   15 +++++++++++++++
> >  2 files changed, 19 insertions(+), 0 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-
> omap2/board-omap3evm.c
> > index e615254..549e58e 100644
> > --- a/arch/arm/mach-omap2/board-omap3evm.c
> > +++ b/arch/arm/mach-omap2/board-omap3evm.c
> > @@ -275,7 +275,11 @@ static struct omap_dss_device
> omap3_evm_tv_device = {
> >  	.name			= "tv",
> >  	.driver_name		= "venc",
> >  	.type			= OMAP_DISPLAY_TYPE_VENC,
> > +#if defined(CONFIG_OMAP2_VENC_OUT_TYPE_SVIDEO)
> >  	.phy.venc.type		= OMAP_DSS_VENC_TYPE_SVIDEO,
> > +#elif defined(CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE)
> > +	.u.venc.type		= OMAP_DSS_VENC_TYPE_COMPOSITE,
> 
> 	.u or .phy ?
> 
[Hiremath, Vaibhav] Good catch; and this must be last minute cleanup of patch for submission. I have attached updated/fixed version here with this mail.

Thanks,
Vaibhav
> > +#endif
> >  	.platform_enable	= omap3_evm_enable_tv,
> >  	.platform_disable	= omap3_evm_disable_tv,
> >  };
> 
> 
> 
> ---
> ~Randy
OMAP-DSS2-Kconfig-option-added-for-selection-betwee.patch (application/octet-stream, 2 KB)
From 1ce4ede36b0e84907f1bd4a823d0b6661dead46f Mon Sep 17 00:00:00 2001
From: Vaibhav Hiremath <[email protected]>
Date: Wed, 25 Nov 2009 19:31:54 +0530
Subject: [PATCH] OMAP:DSS2: Kconfig option added for selection between SVIDEO and CVBS

Config option added to arch/arm/plat-omap/Kconfig for selection
of S-Video and Composite output interfaces. The default configuration would
be S-Video.

Signed-off-by: Vaibhav Hiremath <[email protected]>
---
 arch/arm/mach-omap2/board-omap3evm.c |    4 ++++
 drivers/video/omap2/dss/Kconfig      |   15 +++++++++++++++
 2 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index e615254..9d27610 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -275,7 +275,11 @@ static struct omap_dss_device omap3_evm_tv_device = {
 	.name			= "tv",
 	.driver_name		= "venc",
 	.type			= OMAP_DISPLAY_TYPE_VENC,
+#if defined(CONFIG_OMAP2_VENC_OUT_TYPE_SVIDEO)
 	.phy.venc.type		= OMAP_DSS_VENC_TYPE_SVIDEO,
+#elif defined(CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE)
+	.phy.venc.type		= OMAP_DSS_VENC_TYPE_COMPOSITE,
+#endif
 	.platform_enable	= omap3_evm_enable_tv,
 	.platform_disable	= omap3_evm_disable_tv,
 };
diff --git a/drivers/video/omap2/dss/Kconfig b/drivers/video/omap2/dss/Kconfig
index 71d8dec..5b7a8bc 100644
--- a/drivers/video/omap2/dss/Kconfig
+++ b/drivers/video/omap2/dss/Kconfig
@@ -36,6 +36,21 @@ config OMAP2_DSS_VENC
         default y
 	help
 	  OMAP Video Encoder support.
+choice
+	prompt OMAP2_VENC_OUT_TYPE
+	depends on OMAP2_DSS_VENC
+	default OMAP2_VENC_OUT_TYPE_SVIDEO
+
+config OMAP2_VENC_OUT_TYPE_SVIDEO
+	bool "Use S-Video output interface"
+	help
+	  Select this option if you want to choose TV out over S-Video
+
+config OMAP2_VENC_OUT_TYPE_COMPOSITE
+	bool "Use Composite output interface"
+	help
+	  Select this option if you want to choose TV out over Composite
+endchoice
 
 config OMAP2_DSS_SDI
 	bool "SDI support"
-- 
1.6.2.4