From 300a5c2082f790cac5dc5bcc8fef345ff8705733 Mon Sep 17 00:00:00 2001
From: Archit Taneja <archit@ti.com>
Date: Tue, 12 Feb 2013 14:05:37 +0530
Subject: [PATCH] --- yaml --- r: 374159 b: refs/heads/master c:
 3c803f40e8da044f5b66bf21a454315117c9ac17 h: refs/heads/master i:   374157:
 450558c513dea4c96f6c7d86a9bacc23fdd9e448   374155:
 be091b637ff4fb2389e765fa5889f9749605f262   374151:
 ea97d14a44cb5440aec851bce26c427256f0e64a   374143:
 dbcdd992a48298898b02480fc198eb6590456958 v: v3

---
 [refs]                                       |  2 +-
 trunk/arch/arm/mach-omap2/board-rx51-video.c | 26 ++++++--------------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index 92d498c70491..1274ae7cfbe5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a05f92b70205df5927d767e9e0afecd2e5fde6d2
+refs/heads/master: 3c803f40e8da044f5b66bf21a454315117c9ac17
diff --git a/trunk/arch/arm/mach-omap2/board-rx51-video.c b/trunk/arch/arm/mach-omap2/board-rx51-video.c
index eb667261df08..bd74f9f6063b 100644
--- a/trunk/arch/arm/mach-omap2/board-rx51-video.c
+++ b/trunk/arch/arm/mach-omap2/board-rx51-video.c
@@ -16,6 +16,8 @@
 #include <linux/mm.h>
 #include <asm/mach-types.h>
 #include <video/omapdss.h>
+#include <video/omap-panel-data.h>
+
 #include <linux/platform_data/spi-omap2-mcspi.h>
 
 #include "soc.h"
@@ -27,25 +29,16 @@
 
 #if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
 
-static int rx51_lcd_enable(struct omap_dss_device *dssdev)
-{
-	gpio_set_value(dssdev->reset_gpio, 1);
-	return 0;
-}
-
-static void rx51_lcd_disable(struct omap_dss_device *dssdev)
-{
-	gpio_set_value(dssdev->reset_gpio, 0);
-}
+static struct panel_acx565akm_data lcd_data = {
+	.reset_gpio	= RX51_LCD_RESET_GPIO,
+};
 
 static struct omap_dss_device rx51_lcd_device = {
 	.name			= "lcd",
 	.driver_name		= "panel-acx565akm",
 	.type			= OMAP_DISPLAY_TYPE_SDI,
 	.phy.sdi.datapairs	= 2,
-	.reset_gpio		= RX51_LCD_RESET_GPIO,
-	.platform_enable	= rx51_lcd_enable,
-	.platform_disable	= rx51_lcd_disable,
+	.data			= &lcd_data,
 };
 
 static struct omap_dss_device  rx51_tv_device = {
@@ -76,13 +69,8 @@ static int __init rx51_video_init(void)
 		return 0;
 	}
 
-	if (gpio_request_one(RX51_LCD_RESET_GPIO, GPIOF_OUT_INIT_HIGH,
-			     "LCD ACX565AKM reset")) {
-		pr_err("%s failed to get LCD Reset GPIO\n", __func__);
-		return 0;
-	}
-
 	omap_display_init(&rx51_dss_board_info);
+
 	return 0;
 }