From patchwork Fri Aug 20 02:38:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Nelson X-Patchwork-Id: 120451 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7K2cvjk011828 for ; Fri, 20 Aug 2010 02:39:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751895Ab0HTCjF (ORCPT ); Thu, 19 Aug 2010 22:39:05 -0400 Received: from mail-gx0-f174.google.com ([209.85.161.174]:43344 "EHLO mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750927Ab0HTCjE (ORCPT ); Thu, 19 Aug 2010 22:39:04 -0400 Received: by mail-gx0-f174.google.com with SMTP id 23so1041711gxk.19 for ; Thu, 19 Aug 2010 19:39:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=bL4ohs6a77zhxknqlSYgULsPswj63il1HrM4Rr/ie8c=; b=w8i/xCSf4QwaGzQRsdVla2f/ccKkn/EIkaFC15Rg4eL0p+1LSPRrSPfwYKuFOBPqwm 9NfRcrR1wDCz2LzNIfr1ZiIkVLEDXNBQAlXPVzd1uPAqBz2W3l/j57ifJO4V/4FPfLz5 MS7tXbl3gdXXoIUdLIQ2yUP3WKT3DTTXBFDY0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=hN8s6Rwv3VQfGNUzsWSxCEsA2EeclW7kcyZIC7z6SYKsu1WmHUNali4rIfg/jkAxrh xluiQBJ1RLluOPRhVvfNsiMXxL6dSvQ3W4yOGHS6fM6p8Xrr7L5Kdj2ESc/gisaM2Bdx Qguhid6UuU5nun/A3uDzRzY0/qHcFCwLW6sJQ= Received: by 10.151.62.37 with SMTP id p37mr896219ybk.275.1282271942658; Thu, 19 Aug 2010 19:39:02 -0700 (PDT) Received: from localhost.localdomain (thief-pool1-30.mncable.net [64.77.208.30]) by mx.google.com with ESMTPS id m11sm3307701ybn.16.2010.08.19.19.39.01 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 19 Aug 2010 19:39:01 -0700 (PDT) From: Robert Nelson To: tony@atomide.com Cc: linux-omap@vger.kernel.org, Robert Nelson Subject: [PATCH v6 3/3] ARM: OMAP: Beagle: no gpio_wp pin connection on xM Date: Thu, 19 Aug 2010 21:38:46 -0500 Message-Id: <1282271926-2676-3-git-send-email-robertcnelson@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1282271926-2676-1-git-send-email-robertcnelson@gmail.com> References: <1282271926-2676-1-git-send-email-robertcnelson@gmail.com> 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.3 (demeter.kernel.org [140.211.167.41]); Fri, 20 Aug 2010 02:39:18 +0000 (UTC) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index e9af4fd..1f455c3 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -274,7 +274,9 @@ static struct gpio_led gpio_leds[]; static int beagle_twl_gpio_setup(struct device *dev, unsigned gpio, unsigned ngpio) { - if ((omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_C1_3) || + if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) { + mmc[0].gpio_wp = -EINVAL; + } else if ((omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_C1_3) || (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_C4)) { omap_mux_init_gpio(23, OMAP_PIN_INPUT); mmc[0].gpio_wp = 23;