From patchwork Mon Aug 16 14:36:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Nelson X-Patchwork-Id: 119714 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 o7GEbbGw021835 for ; Mon, 16 Aug 2010 14:37:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754523Ab0HPOhZ (ORCPT ); Mon, 16 Aug 2010 10:37:25 -0400 Received: from mail-yw0-f46.google.com ([209.85.213.46]:41810 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754262Ab0HPOhX (ORCPT ); Mon, 16 Aug 2010 10:37:23 -0400 Received: by ywh1 with SMTP id 1so1888268ywh.19 for ; Mon, 16 Aug 2010 07:37:22 -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=Gr0s4idyt0qN+LmWdlIgqrR116MMgtSymPuymw6MsqxdDnatyX+699BlAEyyxfE5jd OXNJoixrd1TZMGtWuSLKK4tj3Es4kVGSTOCAVC02jvP4UVhAkNkF+RlGrPA3LNjJ+dbe GjImLJVkZAEYw431b/r2xtxE+pf7YchfnasYc= 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=bCZh1PMmbC87d0q27MWI7Kbf8LaVk1iCWswZ/3fdfZgZz7xEpC6SVGXHHprDgtRael uG8E9WXlMS5+9Bb1KrZHmWWbCdM96QsFSOUt6g4O/iH5uawKXex2kCdx/Zyc6U3qohOq nGsbiY3pUyZssZwiNNFyhHBuvwSQeF4nsv+2M= Received: by 10.101.136.30 with SMTP id o30mr4632315ann.224.1281969441392; Mon, 16 Aug 2010 07:37:21 -0700 (PDT) Received: from localhost.localdomain (thief-statics-245.mncable.net [64.77.213.245]) by mx.google.com with ESMTPS id 14sm10489967ant.21.2010.08.16.07.37.19 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 16 Aug 2010 07:37:20 -0700 (PDT) From: Robert Nelson To: tony@atomide.com Cc: linux-omap@vger.kernel.org, Robert Nelson Subject: [PATCH v4 3/3] ARM: OMAP: Beagle: no gpio_wp pin connection on xM Date: Mon, 16 Aug 2010 09:36:43 -0500 Message-Id: <1281969403-28312-3-git-send-email-robertcnelson@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1281969403-28312-1-git-send-email-robertcnelson@gmail.com> References: <1281969403-28312-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]); Mon, 16 Aug 2010 14:37:56 +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;