From patchwork Thu Mar 17 12:44:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martin X-Patchwork-Id: 641421 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2HCj6o3007029 for ; Thu, 17 Mar 2011 12:45:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752931Ab1CQMpF (ORCPT ); Thu, 17 Mar 2011 08:45:05 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:61962 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752749Ab1CQMpE (ORCPT ); Thu, 17 Mar 2011 08:45:04 -0400 Received: by wya21 with SMTP id 21so2719651wya.19 for ; Thu, 17 Mar 2011 05:45:03 -0700 (PDT) Received: by 10.216.162.70 with SMTP id x48mr863302wek.4.1300365902879; Thu, 17 Mar 2011 05:45:02 -0700 (PDT) Received: from localhost.localdomain (180.51.18.95.dynamic.jazztel.es [95.18.51.180]) by mx.google.com with ESMTPS id n4sm1087073wee.4.2011.03.17.05.44.59 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 17 Mar 2011 05:45:01 -0700 (PDT) From: Javier Martin To: linux-omap@vger.kernel.org Cc: tony@atomide.com, linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org, Javier Martin Subject: [PATCH] omap3: beaglexm: fix user button. Date: Thu, 17 Mar 2011 13:44:50 +0100 Message-Id: <1300365890-28544-1-git-send-email-javier.martin@vista-silicon.com> X-Mailer: git-send-email 1.7.0.4 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 17 Mar 2011 12:45:06 +0000 (UTC) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 46d814a..abf87d1 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -615,6 +615,10 @@ static void __init omap3_beagle_init(void) omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); omap3_beagle_init_rev(); omap3_beagle_i2c_init(); + /* xM version uses pin 4 instead of 7 for user button */ + if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) { + gpio_buttons[0].gpio = 4; + } platform_add_devices(omap3_beagle_devices, ARRAY_SIZE(omap3_beagle_devices)); omap_serial_init();