aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPaolo Pisati <paolo.pisati@canonical.com>2012-01-09 11:46:15 +0100
committerTim Gardner <tim.gardner@canonical.com>2012-03-19 11:29:07 -0600
commitd337506f918519a1aaec3edccbab514e1fb91b69 (patch)
treec488785b40933fd56c91ced2bda04aae00adff21 /arch
parentc3567d45c3228bb16f0fe92e411886430f7d7da5 (diff)
Revert "UBUNTU: SAUCE: omap3: beagle: detect new xM revision B"
This reverts commit 72bc65cfa41a0d292153b609b132b55efa3c82cb. BugLink: http://bugs.launchpad.net/bugs/912199 Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/board-omap3beagle.c9
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 1046befb46f..4d6b96235d0 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;