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>
---
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
");
+ printk(KERN_INFO "OMAP3 Beagle Rev: xM Ax/Bx
");
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
");
- omap3_beagle_version = OMAP3BEAGLE_BOARD_XM;
- break;
case 2:
printk(KERN_INFO "OMAP3 Beagle Rev: xM C
");
omap3_beagle_version = OMAP3BEAGLE_BOARD_XMC;
--
1.7.5.4


--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team

Revert "UBUNTU: SAUCE: omap3: beagle: detect new xM revision B"
 

This reverts commit c067bebbfbd292ccc11a85b0abaffd6b5e39e619.

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

Signed-off-by: Paolo Pisati <paolo.pisati@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 4bf138b..24e59ec 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -61,8 +61,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
+ * XM = GPIO173, GPIO172, GPIO171: 0 0 0
*/
enum {
OMAP3BEAGLE_BOARD_UNKN = 0,
@@ -122,11 +121,7 @@ static void __init omap3_beagle_init_rev(void)
omap3_beagle_version = OMAP3BEAGLE_BOARD_C4;
break;
case 0:
- printk(KERN_INFO "OMAP3 Beagle Rev: xM A
");
- omap3_beagle_version = OMAP3BEAGLE_BOARD_XM;
- break;
- case 1:
- printk(KERN_INFO "OMAP3 Beagle Rev: xM B
");
+ printk(KERN_INFO "OMAP3 Beagle Rev: xM
");
omap3_beagle_version = OMAP3BEAGLE_BOARD_XM;
break;
default:
--
1.7.5.4


--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team