Patchwork [2/5] Revert "UBUNTU: SAUCE: omap3: beagle: detect new xM revision C"

login
register
mail settings
Submitter Paolo Pisati
Date Jan. 9, 2012, 11:09 a.m.
Message ID <1326107367-13682-3-git-send-email-paolo.pisati@canonical.com>
Download mbox | patch
Permalink /patch/134992/
State New
Headers show

Comments

Paolo Pisati - Jan. 9, 2012, 11:09 a.m.
This reverts commit facc7609935b88bd6a4d2216349262ac8d65e9a3.

BugLink: http://bugs.launchpad.net/bugs/912199

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
---
 arch/arm/mach-omap2/board-omap3beagle.c |   15 +++------------
 1 files changed, 3 insertions(+), 12 deletions(-)

Patch

diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 991810b..4bf138b 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -63,7 +63,6 @@ 
  *	C4	= GPIO173, GPIO172, GPIO171: 1 0 1
  *	XMA	= GPIO173, GPIO172, GPIO171: 0 0 0
  *	XMB	= GPIO173, GPIO172, GPIO171: 0 0 1
- *	XMC	= GPIO173, GPIO172, GPIO171: 0 1 0
  */
 enum {
 	OMAP3BEAGLE_BOARD_UNKN = 0,
@@ -71,7 +70,6 @@  enum {
 	OMAP3BEAGLE_BOARD_C1_3,
 	OMAP3BEAGLE_BOARD_C4,
 	OMAP3BEAGLE_BOARD_XM,
-	OMAP3BEAGLE_BOARD_XMC,
 };
 
 static u8 omap3_beagle_version;
@@ -131,10 +129,6 @@  static void __init omap3_beagle_init_rev(void)
 		printk(KERN_INFO "OMAP3 Beagle Rev: xM B\n");
 		omap3_beagle_version = OMAP3BEAGLE_BOARD_XM;
 		break;
-	case 2:
-		printk(KERN_INFO "OMAP3 Beagle Rev: xM C\n");
-		omap3_beagle_version = OMAP3BEAGLE_BOARD_XMC;
-		break;
 	default:
 		printk(KERN_INFO "OMAP3 Beagle Rev: unknown %hd\n", beagle_rev);
 		omap3_beagle_version = OMAP3BEAGLE_BOARD_UNKN;
@@ -235,8 +229,7 @@  static void __init beagle_display_init(void)
 	int r;
 
 	/* DVI reset GPIO is different between beagle revisions */
-	if ((omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) ||
-			(omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XMC))
+	if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM)
 		beagle_dvi_device.reset_gpio = 129;
 	else
 		beagle_dvi_device.reset_gpio = 170;
@@ -273,8 +266,7 @@  static int beagle_twl_gpio_setup(struct device *dev,
 {
 	int r, usb_pwr_level;
 
-	if ((omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) ||
-			(omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XMC)) {
+	if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) {
 		mmc[0].gpio_wp = -EINVAL;
 	} else if ((omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_C1_3) ||
 		(omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_C4)) {
@@ -296,8 +288,7 @@  static int beagle_twl_gpio_setup(struct device *dev,
 	 * high / others active low)
 	 * DVI reset GPIO is different between beagle revisions
 	 */
-	if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM ||
-			(omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XMC)) {
+	if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) {
 		usb_pwr_level = GPIOF_OUT_INIT_HIGH;
 		beagle_dvi_device.reset_gpio = 129;
 		/*