Skip to content

Commit

Permalink
omap: rx51: Remove tvout code that plays with gpio 40
Browse files Browse the repository at this point in the history
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'

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Cc: Srikar <ext-srikar.1.bhavanarayana@nokia.com>
Acked-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
Jarkko Nikula authored and Tony Lindgren committed Dec 22, 2010
1 parent 31bbb4f commit 6d38c4b
Showing 1 changed file with 0 additions and 20 deletions.
20 changes: 0 additions & 20 deletions arch/arm/mach-omap2/board-rx51-video.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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",
Expand All @@ -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[] = {
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 6d38c4b

Please sign in to comment.