From patchwork Wed Aug 18 15:56:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Nelson X-Patchwork-Id: 120209 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 o7IFv6Vl026353 for ; Wed, 18 Aug 2010 15:58:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753812Ab0HRP5N (ORCPT ); Wed, 18 Aug 2010 11:57:13 -0400 Received: from mail-yw0-f46.google.com ([209.85.213.46]:36537 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753780Ab0HRP5L (ORCPT ); Wed, 18 Aug 2010 11:57:11 -0400 Received: by ywh1 with SMTP id 1so277028ywh.19 for ; Wed, 18 Aug 2010 08:57:11 -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=fayWVeqzqsaozE8opG3EtsFdBqHw5VCVCf2p3NdzSNavH/PGgbNm3AZVhywj6hWCdz Ad5lySm69hP0Ae4T998D6M0VlSzI6/FqSKOt9orMldiv9ZR64vefhH95Hbt4qMxbty11 8wfPCvLTsdSl7WyqcwnrVKeYfvMOKFNbK2C1Y= 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=Hz8Ek4nBT96fN8PQ/W+kMojso0ehtjmgTUQS5GLtU+57fIpU7zmpyH9r+MBQM2jcQ+ Bc1+4cqjYaNm1ZDTrg5IeOlBMqEkj2iZ7mGb0QdIO182978zCOtGoe14FrWtJ/95nn4R LczMR3dqkjhmPSa8rMEjDaA90uA0z/tZkFTvw= Received: by 10.150.235.19 with SMTP id i19mr472916ybh.220.1282147030584; Wed, 18 Aug 2010 08:57:10 -0700 (PDT) Received: from localhost.localdomain (thief-statics-245.mncable.net [64.77.213.245]) by mx.google.com with ESMTPS id q21sm1438081ybk.23.2010.08.18.08.57.08 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 18 Aug 2010 08:57:09 -0700 (PDT) From: Robert Nelson To: tony@atomide.com Cc: linux-omap@vger.kernel.org, Robert Nelson Subject: [PATCH v5 3/3] ARM: OMAP: Beagle: no gpio_wp pin connection on xM Date: Wed, 18 Aug 2010 10:56:53 -0500 Message-Id: <1282147013-508-3-git-send-email-robertcnelson@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1282147013-508-1-git-send-email-robertcnelson@gmail.com> References: <1282147013-508-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]); Wed, 18 Aug 2010 15:58:07 +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;