From patchwork Fri Aug 13 12:21:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Nelson X-Patchwork-Id: 119414 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 o7DCLSNc013110 for ; Fri, 13 Aug 2010 12:21:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934251Ab0HMMV2 (ORCPT ); Fri, 13 Aug 2010 08:21:28 -0400 Received: from mail-gw0-f46.google.com ([74.125.83.46]:48563 "EHLO mail-gw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934235Ab0HMMV1 (ORCPT ); Fri, 13 Aug 2010 08:21:27 -0400 Received: by gwb20 with SMTP id 20so905238gwb.19 for ; Fri, 13 Aug 2010 05:21:26 -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=2m2ULhCUGcrAnekpCYbqSJVPOG2tbqJcrLiG4BOKKfU=; b=FZLS0DZCmW7aM/hbTwsrJxOk2C0mKhecx4KMF1aQSHbgLuUUdLITs/y582/3E+MgHN bcfq76pyDvNLuKqxImXkiLj8Thoit2FjmJpkFhROpyzTKhI/7Ri5bakcV5I0z6vwRlmc sO0l/c4nK+VweEnS8yZpIkXiXoHu0dCO+5qHY= 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=CXn1sDh5OeikWTTi5PQ06iTnINpl9dIJclXqYw+Ss1fUNh+nWtde/qF0Vw/Q2zWCNd zdQUXymQdmt+H/8H7OyShDD7qmr8ecCFaNhfqUlljuVRPCeDN85uZPId00/2EbvndFC/ r4mXxlrPtoKr6ExcuSbGpyxREIZo0IVhQ0+04= Received: by 10.151.46.14 with SMTP id y14mr1924093ybj.242.1281702086834; Fri, 13 Aug 2010 05:21:26 -0700 (PDT) Received: from localhost.localdomain (thief-pool1-30.mncable.net [64.77.208.30]) by mx.google.com with ESMTPS id p14sm2833238ybb.9.2010.08.13.05.21.25 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 13 Aug 2010 05:21:26 -0700 (PDT) From: Robert Nelson To: tony@atomide.com Cc: linux-omap@vger.kernel.org, Robert Nelson Subject: [PATCH v3 3/3] ARM: OMAP: Beagle: no gpio_wp pin connection on xM Date: Fri, 13 Aug 2010 07:21:10 -0500 Message-Id: <1281702070-10525-3-git-send-email-robertcnelson@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1281702070-10525-1-git-send-email-robertcnelson@gmail.com> References: <1281702070-10525-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, 13 Aug 2010 12:21:29 +0000 (UTC) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 08fa68f..449a776 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -244,7 +244,9 @@ static struct gpio_led gpio_leds[]; static int beagle_twl_gpio_setup(struct device *dev, unsigned gpio, unsigned ngpio) { - if ((get_omap3_beagle_rev() == OMAP3BEAGLE_BOARD_C1_3) || + if (get_omap3_beagle_rev() == OMAP3BEAGLE_BOARD_XM) { + mmc[0].gpio_wp = -EINVAL; + } else if ((get_omap3_beagle_rev() == OMAP3BEAGLE_BOARD_C1_3) || (get_omap3_beagle_rev() == OMAP3BEAGLE_BOARD_C4)) { omap_mux_init_gpio(23, OMAP_PIN_INPUT); mmc[0].gpio_wp = 23;