From patchwork Mon Jan 9 11:09:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 134990 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id B2BCDB6F9D for ; Mon, 9 Jan 2012 22:09:43 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RkD6f-0001vT-Bz; Mon, 09 Jan 2012 11:09:37 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RkD6Y-0001uW-MX for kernel-team@lists.ubuntu.com; Mon, 09 Jan 2012 11:09:30 +0000 Received: from business-89-133-214-90.business.broadband.hu ([89.133.214.90] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1RkD6Y-0003BQ-Ik for kernel-team@lists.ubuntu.com; Mon, 09 Jan 2012 11:09:30 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/5] Revert "UBUNTU: SAUCE: omap3: beagle: detect new xM revision B" Date: Mon, 9 Jan 2012 12:09:25 +0100 Message-Id: <1326107367-13682-4-git-send-email-paolo.pisati@canonical.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1326107367-13682-1-git-send-email-paolo.pisati@canonical.com> References: <1326107367-13682-1-git-send-email-paolo.pisati@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com This reverts commit c067bebbfbd292ccc11a85b0abaffd6b5e39e619. BugLink: http://bugs.launchpad.net/bugs/912199 Signed-off-by: Paolo Pisati --- 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\n"); - omap3_beagle_version = OMAP3BEAGLE_BOARD_XM; - break; - case 1: - printk(KERN_INFO "OMAP3 Beagle Rev: xM B\n"); + printk(KERN_INFO "OMAP3 Beagle Rev: xM\n"); omap3_beagle_version = OMAP3BEAGLE_BOARD_XM; break; default: