Skip to contentSkip to conversation

omap: rx51: Remove tvout code that plays with gpio 40

PATCH New Jarkko Nikula 4 participants 4 messages Dec 21, 2010 – Dec 22, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 omap: rx51: Remove tvout code that plays with gpio 40

Commit 60d24ee "Added video data to support tvout on rx51" added code that tries to assign gpio 40 as OMAP DSS reset_gpio for tvout. This is wrong since this gpio has nothing to do with OMAP DSS but it is used to control one switch that selects is the audio jack connected to tvout or audio circuitry.

This switch is already supported by the RX51 ASoC driver so there is no need to control it elsewhere. Switch is contolled with ALSA control 'Jack Function' and tvout can be selected with following example:

amixer -D hw:0 set 'Jack Function' 'TV-OUT'

---
 arch/arm/mach-omap2/board-rx51-video.c |   20 --------------------
 1 files changed, 0 insertions(+), 20 deletions(-)
arch/arm/mach-omap2/board-rx51-video.c +0 -20
index 9919581..acd6700 100644
@@ -24,9 +24,6 @@
 #include "mux.h"
 
 #define RX51_LCD_RESET_GPIO	90
-/* REVISIT  to verify with rx51.c at sound/soc/omap */
-#define RX51_TVOUT_SEL_GPIO	40
-
 
 #if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
 
@@ -41,17 +38,6 @@ static void rx51_lcd_disable(struct omap_dss_device *dssdev)
 	gpio_set_value(dssdev->reset_gpio, 0);
 }
 
-static int rx51_tvout_enable(struct omap_dss_device *dssdev)
-{
-	gpio_set_value(dssdev->reset_gpio, 1);
-	return 0;
-}
-
-static void rx51_tvout_disable(struct omap_dss_device *dssdev)
-{
-	gpio_set_value(dssdev->reset_gpio, 0);
-}
-
 static struct omap_dss_device rx51_lcd_device = {
 	.name			= "lcd",
 	.driver_name		= "panel-acx565akm",
@@ -67,9 +53,6 @@ static struct omap_dss_device  rx51_tv_device = {
 	.type			= OMAP_DISPLAY_TYPE_VENC,
 	.driver_name		= "venc",
 	.phy.venc.type	        = OMAP_DSS_VENC_TYPE_COMPOSITE,
-	.reset_gpio	        = RX51_TVOUT_SEL_GPIO,
-	.platform_enable        = rx51_tvout_enable,
-	.platform_disable       = rx51_tvout_disable,
 };
 
 static struct omap_dss_device *rx51_dss_devices[] = {
@@ -112,9 +95,6 @@ static int __init rx51_video_init(void)
 
 	gpio_direction_output(RX51_LCD_RESET_GPIO, 1);
 
-	/* REVISIT  to verify with rx51.c at sound/soc/omap */
-	gpio_direction_output(RX51_TVOUT_SEL_GPIO, 1);
-
 	platform_add_devices(rx51_video_devices,
 				ARRAY_SIZE(rx51_video_devices));
 	return 0;
Signature · 1 line
1.7.2.3
#1 lore raw

PATCH 1/1 omap: rx51: Remove tvout code that plays with gpio 40

Quoted 11 lines · ext Jarkko Nikula

Commit 60d24ee "Added video data to support tvout on rx51" added code that tries to assign gpio 40 as OMAP DSS reset_gpio for tvout. This is wrong since this gpio has nothing to do with OMAP DSS but it is used to control one switch that selects is the audio jack connected to tvout or audio circuitry.

This switch is already supported by the RX51 ASoC driver so there is no need to control it elsewhere. Switch is contolled with ALSA control 'Jack Function' and tvout can be selected with following example:

amixer -D hw:0 set 'Jack Function' 'TV-OUT'

Looks good. platform_enable/disable and reset_gpio fields should anyway be removed from the omap_dss_device struct, so this goes into right direction.

Tony, can you take this patch also, as (I guess) it depends on the previous rx51 patches from Jarkko?

Tomi

#2 lore raw

PATCH 1/1 omap: rx51: Remove tvout code that plays with gpio 40

Good, Now GPIO40 now supports switch between Headset and TV Out. Now updated ASoc Driver is already available in upstream kernel to support the switching between Headset and TvOut ...

Srikar

Quoted 24 lines · Tomi Valkeinen
Quoted 11 lines · ext Jarkko Nikula

Commit 60d24ee "Added video data to support tvout on rx51" added code that tries to assign gpio 40 as OMAP DSS reset_gpio for tvout. This is wrong since this gpio has nothing to do with OMAP DSS but it is used to control one switch that selects is the audio jack connected to tvout or audio circuitry.

This switch is already supported by the RX51 ASoC driver so there is no need to control it elsewhere. Switch is contolled with ALSA control 'Jack Function' and tvout can be selected with following example:

amixer -D hw:0 set 'Jack Function' 'TV-OUT'

Looks good. platform_enable/disable and reset_gpio fields should anyway be removed from the omap_dss_device struct, so this goes into right direction.

Tony, can you take this patch also, as (I guess) it depends on the previous rx51 patches from Jarkko?

Tomi

maintainer
#3 lore raw

PATCH 1/1 omap: rx51: Remove tvout code that plays with gpio 40

In reply to Tomi Valkeinen
Quoted 13 lines · Tomi Valkeinen
Quoted 11 lines · ext Jarkko Nikula

Commit 60d24ee "Added video data to support tvout on rx51" added code that tries to assign gpio 40 as OMAP DSS reset_gpio for tvout. This is wrong since this gpio has nothing to do with OMAP DSS but it is used to control one switch that selects is the audio jack connected to tvout or audio circuitry.

This switch is already supported by the RX51 ASoC driver so there is no need to control it elsewhere. Switch is contolled with ALSA control 'Jack Function' and tvout can be selected with following example:

amixer -D hw:0 set 'Jack Function' 'TV-OUT'

Quoted 8 lines

Looks good. platform_enable/disable and reset_gpio fields should anyway be removed from the omap_dss_device struct, so this goes into right direction.

Tony, can you take this patch also, as (I guess) it depends on the previous rx51 patches from Jarkko?

Queuing this one too.

Tony