From: hvaibhav@ti.com
To: tomi.valkeinen@nokia.com
Cc: linux-omap@vger.kernel.org,
linux-fbdev-devel@lists.sourceforge.net,
linux-fbdev@vger.kernel.org, Vaibhav Hiremath <hvaibhav@ti.com>
Subject: [PATCH 5/5] OMAP3EVM: Kconfig option added for selection between SVIDEO and CVBS
Date: Thu, 17 Dec 2009 15:31:36 +0000 [thread overview]
Message-ID: <1261063176-20101-1-git-send-email-hvaibhav@ti.com> (raw)
In-Reply-To: <hvaibhav@ti.com>
From: Vaibhav Hiremath <hvaibhav@ti.com>
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 <hvaibhav@ti.com>
---
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,
+#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
next reply other threads:[~2009-12-17 15:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-17 15:31 hvaibhav [this message]
2009-12-17 16:42 ` [PATCH 5/5] OMAP3EVM: Kconfig option added for selection Randy Dunlap
2009-12-18 4:25 ` Hiremath, Vaibhav
2009-12-22 12:08 ` Tomi Valkeinen
2009-12-23 15:24 ` Hiremath, Vaibhav
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1261063176-20101-1-git-send-email-hvaibhav@ti.com \
--to=hvaibhav@ti.com \
--cc=linux-fbdev-devel@lists.sourceforge.net \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=tomi.valkeinen@nokia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).