From 70eded36df2086b435b9aea2f935d54fe5083086 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@beagleboard.org>
Date: Tue, 11 Jan 2011 17:13:36 +0000
Subject: [PATCH] --- yaml --- r: 231119 b: refs/heads/master c:
 f8362d215549c66066f78e67c033dd370ae50322 h: refs/heads/master i:   231117:
 ea2e279602657444b54266776d1e0c715e7d57d2   231115:
 9060d3c80ba97541faaa907e005feb0999d3dbdf   231111:
 c9b5e6c709d64af16953b225a9fd5a9053ff87db   231103:
 53e91ba0be2782071f8d44b6082d2ce5fbbb9c37 v: v3

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

diff --git a/[refs] b/[refs]
index 5ef5655fcf1e..8e5af7813b8a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68fc3e152c9f99323e2a4917967725aec5281b32
+refs/heads/master: f8362d215549c66066f78e67c033dd370ae50322
diff --git a/trunk/arch/arm/mach-omap2/board-omap3beagle.c b/trunk/arch/arm/mach-omap2/board-omap3beagle.c
index af1166bd1c86..673deb9189fe 100644
--- a/trunk/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/trunk/arch/arm/mach-omap2/board-omap3beagle.c
@@ -199,7 +199,7 @@ static struct omap_dss_device beagle_dvi_device = {
 	.name = "dvi",
 	.driver_name = "generic_panel",
 	.phy.dpi.data_lines = 24,
-	.reset_gpio = 170,
+	.reset_gpio = -EINVAL,
 	.platform_enable = beagle_enable_dvi,
 	.platform_disable = beagle_disable_dvi,
 };
@@ -307,6 +307,12 @@ static int beagle_twl_gpio_setup(struct device *dev,
 	else
 		gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0);
 
+	/* DVI reset GPIO is different between beagle revisions */
+	if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM)
+		beagle_dvi_device.reset_gpio = 129;
+	else
+		beagle_dvi_device.reset_gpio = 170;
+
 	/* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */
 	gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;