Commit 6d38c4b4 authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Tony Lindgren
Browse files

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

Commit 60d24eed

 "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

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: default avatarJarkko Nikula <>
Cc: Srikar <>
Acked-by: default avatarTomi Valkeinen <>
Signed-off-by: default avatarTony Lindgren <>
parent 31bbb4f0
......@@ -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 = {
.driver_name = "venc",
.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);
return 0;
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment