[PATCH 2/3] Revert "UBUNTU: SAUCE: omap3: beagle: detect new xM revision B"

Paolo Pisati paolo.pisati at canonical.com
Mon Jan 9 10:46:15 UTC 2012


This reverts commit 72bc65cfa41a0d292153b609b132b55efa3c82cb.

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

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

diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 1046bef..4d6b962 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -60,8 +60,7 @@
  *	AXBX	= GPIO173, GPIO172, GPIO171: 1 1 1
  *	C1_3	= GPIO173, GPIO172, GPIO171: 1 1 0
  *	C4	= GPIO173, GPIO172, GPIO171: 1 0 1
- *	XMA = GPIO173, GPIO172, GPIO171: 0 0 0
- *	XMB = GPIO173, GPIO172, GPIO171: 0 0 1
+ *	XMA/XMB = GPIO173, GPIO172, GPIO171: 0 0 0
  *	XMC = GPIO173, GPIO172, GPIO171: 0 1 0
  */
 enum {
@@ -143,14 +142,10 @@ static void __init omap3_beagle_init_rev(void)
 		beagle_config.usr_button_gpio = 7;
 		break;
 	case 0:
-		printk(KERN_INFO "OMAP3 Beagle Rev: xM A\n");
+		printk(KERN_INFO "OMAP3 Beagle Rev: xM Ax/Bx\n");
 		omap3_beagle_version = OMAP3BEAGLE_BOARD_XM;
 		beagle_config.usb_pwr_level = GPIOF_OUT_INIT_HIGH;
 		break;
-	case 1:
-		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;
-- 
1.7.5.4





More information about the kernel-team mailing list