From patchwork Wed Aug 11 23:37:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Nelson X-Patchwork-Id: 118920 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 o7BNbuBb024426 for ; Wed, 11 Aug 2010 23:37:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758082Ab0HKXh6 (ORCPT ); Wed, 11 Aug 2010 19:37:58 -0400 Received: from mail-yw0-f46.google.com ([209.85.213.46]:47614 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758052Ab0HKXh5 (ORCPT ); Wed, 11 Aug 2010 19:37:57 -0400 Received: by ywh1 with SMTP id 1so194148ywh.19 for ; Wed, 11 Aug 2010 16:37:56 -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=BWjvdMVScbnLYvVKs9YNFWYADK+Ko43MekpwIJYXwkfi2dyxSHpDSi/I1vf+lvnvmU e0jyKLxCtUMDYpSHGeurHx4kQY4n8P07oFud1/doGSztajfgcEhWqSeGEPDmAVxOg22E ORClHHyQ54crCQHhRblBaWOW+UXt0YHs9aYK0= 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=OQAnZIBELXlDx4ln5nHxVXOcvaMF/k/KEylqIQ12k7CY9hgrW2ZXusCQbAta/H/gbw Ig+X5ovPg0qyOgP7Vo53hIKSUudQetc21i0rOWluL0803obnwspK47RQfEB46RjjdSzP PZBh1GzPUVgQXYbvIbrw8IGxsrRziRfl7tZNE= Received: by 10.150.73.32 with SMTP id v32mr22398265yba.128.1281569876878; Wed, 11 Aug 2010 16:37:56 -0700 (PDT) Received: from localhost.localdomain (thief-pool1-30.mncable.net [64.77.208.30]) by mx.google.com with ESMTPS id p8sm709257ybk.3.2010.08.11.16.37.55 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 11 Aug 2010 16:37:56 -0700 (PDT) From: Robert Nelson To: tony@atomide.com Cc: linux-omap@vger.kernel.org, Robert Nelson Subject: [PATCH v2 3/3] ARM: OMAP: Beagle: no gpio_wp pin connection on xM Date: Wed, 11 Aug 2010 18:37:42 -0500 Message-Id: <1281569862-19894-3-git-send-email-robertcnelson@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1281569862-19894-1-git-send-email-robertcnelson@gmail.com> References: <1281569862-19894-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, 11 Aug 2010 23:37:58 +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;