OMAP2_VENC_OUT_TYPE_SVIDEO, OMAP2_VENC_OUT_TYPE_COMPOSITE doesn't
exist in Kconfig, therefore removing all references for it from the
source code.
Signed-off-by: Christoph Egger <[email protected]>
---
arch/arm/mach-omap2/board-omap3stalker.c | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c
index f848ba8..b38afd5 100644
--- a/arch/arm/mach-omap2/board-omap3stalker.c
+++ b/arch/arm/mach-omap2/board-omap3stalker.c
@@ -181,11 +181,6 @@ static struct omap_dss_device omap3_stalker_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_stalker_enable_tv,
.platform_disable = omap3_stalker_disable_tv,
};
--
1.7.0.4
* Christoph Egger <[email protected]> [100630 18:58]:
> OMAP2_VENC_OUT_TYPE_SVIDEO, OMAP2_VENC_OUT_TYPE_COMPOSITE doesn't
> exist in Kconfig, therefore removing all references for it from the
> source code.
Let's let Tomi figure out this one, added him to Cc.
Regards,
Tony
> Signed-off-by: Christoph Egger <[email protected]>
> ---
> arch/arm/mach-omap2/board-omap3stalker.c | 5 -----
> 1 files changed, 0 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c
> index f848ba8..b38afd5 100644
> --- a/arch/arm/mach-omap2/board-omap3stalker.c
> +++ b/arch/arm/mach-omap2/board-omap3stalker.c
> @@ -181,11 +181,6 @@ static struct omap_dss_device omap3_stalker_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_stalker_enable_tv,
> .platform_disable = omap3_stalker_disable_tv,
> };
> --
> 1.7.0.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
> -----Original Message-----
> From: [email protected] [mailto:linux-omap-
> [email protected]] On Behalf Of Christoph Egger
> Sent: Wednesday, June 30, 2010 9:31 PM
> To: Tony Lindgren; Russell King; Jason Lam; [email protected];
> [email protected]; [email protected]
> Cc: [email protected]
> Subject: [PATCH 21/33] Removing dead OMAP2_VENC_OUT_TYPE_SVIDEO,
> OMAP2_VENC_OUT_TYPE_COMPOSITE
>
> OMAP2_VENC_OUT_TYPE_SVIDEO, OMAP2_VENC_OUT_TYPE_COMPOSITE doesn't
> exist in Kconfig, therefore removing all references for it from the
> source code.
>
> Signed-off-by: Christoph Egger <[email protected]>
> ---
> arch/arm/mach-omap2/board-omap3stalker.c | 5 -----
> 1 files changed, 0 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-
> omap2/board-omap3stalker.c
> index f848ba8..b38afd5 100644
> --- a/arch/arm/mach-omap2/board-omap3stalker.c
> +++ b/arch/arm/mach-omap2/board-omap3stalker.c
> @@ -181,11 +181,6 @@ static struct omap_dss_device omap3_stalker_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
[Hiremath, Vaibhav] I understand that currently we do not have any mechanism to dynamically change the VENC output type, but I think we should make some default type assumption and keep that initialization here, which is anyway happening to CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE. But explicitly initialize it to CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE for completeness/readability.
Just wanted to add one more thing here is, in our internal releases we do have config option to choose between this. But ideally it would be configurable dynamically.
Thanks,
Vaibhav
> .platform_enable = omap3_stalker_enable_tv,
> .platform_disable = omap3_stalker_disable_tv,
> };
> --
> 1.7.0.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, 2010-07-05 at 10:56 +0200, ext Tony Lindgren wrote:
> * Christoph Egger <[email protected]> [100630 18:58]:
> > OMAP2_VENC_OUT_TYPE_SVIDEO, OMAP2_VENC_OUT_TYPE_COMPOSITE doesn't
> > exist in Kconfig, therefore removing all references for it from the
> > source code.
>
> Let's let Tomi figure out this one, added him to Cc.
The patch doesn't look valid, because either SVIDEO or COMPOSITE should
be set into .phy.venc.type. But then again, the code that's removed
doesn't look valid either, as by default it doesn't do either, and the
COMPOSITE block wouldn't even comile...
Those defines look like some custom defines that have never been in
mainstream linux, so I think the patch can be applied, and the board
file maintainer can fix it with proper code later.
Tomi
>
> Regards,
>
> Tony
>
> > Signed-off-by: Christoph Egger <[email protected]>
> > ---
> > arch/arm/mach-omap2/board-omap3stalker.c | 5 -----
> > 1 files changed, 0 insertions(+), 5 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c
> > index f848ba8..b38afd5 100644
> > --- a/arch/arm/mach-omap2/board-omap3stalker.c
> > +++ b/arch/arm/mach-omap2/board-omap3stalker.c
> > @@ -181,11 +181,6 @@ static struct omap_dss_device omap3_stalker_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_stalker_enable_tv,
> > .platform_disable = omap3_stalker_disable_tv,
> > };
> > --
> > 1.7.0.4
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> > the body of a message to [email protected]
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
> > Please read the FAQ at http://www.tux.org/lkml/