Skip to contentSkip to conversation

ARM: OMAP: omap3stalker: remove two Kconfig macros

PATCH In review Paul Bolle 2 participants 2 messages May 15, 2014 – May 16, 2014

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Paul Bolle

author
#0 lore raw

PATCH 1/1 ARM: OMAP: omap3stalker: remove two Kconfig macros

Checks for CONFIG_OMAP2_VENC_OUT_TYPE_SVIDEO and CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE were added in v2.6.35. But the related Kconfig symbols have never been added to the tree. Remove these checks.

Initialize connector_type to OMAP_DSS_VENC_TYPE_COMPOSITE explicitly. That's what's happening currently: OMAP_DSS_VENC_TYPE_COMPOSITE equals zero and connector_type remains zero since both checks currently fail.

Signed-off-by Paul Bolle <[email protected]>

---
Untested.

 arch/arm/mach-omap2/board-omap3stalker.c | 4 ----
 1 file changed, 4 deletions(-)
arch/arm/mach-omap2/board-omap3stalker.c +0 -4
index 119efaf5808a..a2e035e0792a 100644
@@ -121,11 +121,7 @@ static struct platform_device omap3stalker_tfp410_device = {
 static struct connector_atv_platform_data omap3stalker_tv_pdata = {
 	.name = "tv",
 	.source = "venc.0",
-#if defined(CONFIG_OMAP2_VENC_OUT_TYPE_SVIDEO)
-	.connector_type = OMAP_DSS_VENC_TYPE_SVIDEO,
-#elif defined(CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE)
 	.connector_type = OMAP_DSS_VENC_TYPE_COMPOSITE,
-#endif
 	.invert_polarity = false,
 };
Signature · 1 line
1.9.0
maintainer
#1 lore raw
Quoted 8 lines · Paul Bolle

Checks for CONFIG_OMAP2_VENC_OUT_TYPE_SVIDEO and CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE were added in v2.6.35. But the related Kconfig symbols have never been added to the tree. Remove these checks.

Initialize connector_type to OMAP_DSS_VENC_TYPE_COMPOSITE explicitly. That's what's happening currently: OMAP_DSS_VENC_TYPE_COMPOSITE equals zero and connector_type remains zero since both checks currently fail.

Thanks applying into omap-for-v3.16/board.

Tony

Quoted 26 lines
Signed-off-by Paul Bolle <[email protected]>

---
Untested.

 arch/arm/mach-omap2/board-omap3stalker.c | 4 ----
 1 file changed, 4 deletions(-)
arch/arm/mach-omap2/board-omap3stalker.c +0 -4
index 119efaf5808a..a2e035e0792a 100644
@@ -121,11 +121,7 @@ static struct platform_device omap3stalker_tfp410_device = {
 static struct connector_atv_platform_data omap3stalker_tv_pdata = {
 	.name = "tv",
 	.source = "venc.0",
-#if defined(CONFIG_OMAP2_VENC_OUT_TYPE_SVIDEO)
-	.connector_type = OMAP_DSS_VENC_TYPE_SVIDEO,
-#elif defined(CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE)
 	.connector_type = OMAP_DSS_VENC_TYPE_COMPOSITE,
-#endif
 	.invert_polarity = false,
 };
Signature · 1 line
1.9.0