From patchwork Tue Aug 10 14:40:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Nelson X-Patchwork-Id: 118563 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 o7AElgxK026524 for ; Tue, 10 Aug 2010 14:50:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757606Ab0HJOkZ (ORCPT ); Tue, 10 Aug 2010 10:40:25 -0400 Received: from mail-gw0-f46.google.com ([74.125.83.46]:47162 "EHLO mail-gw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756426Ab0HJOkY (ORCPT ); Tue, 10 Aug 2010 10:40:24 -0400 Received: by gwb20 with SMTP id 20so3737991gwb.19 for ; Tue, 10 Aug 2010 07:40:24 -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; bh=6k8+/HxVGvlTrkKTJJhyiFpBxbPH7rHN0QuUKb9SPiM=; b=bE+t0wx2wL0ojSikcuZJlo8wassgR5uJWT9WUaJJ2EQT6EuSfpeOBx2Ssxw0cF4I67 Y7WlTZsYXsxwAUJsHNJNigMuFcfVQdPHp3O/PiK0dGn2NU65WvUL5e0J0DYwTlBQpy9v hWzuTpZrFXK178h6JlGIak+CTfxIjz5tavPwA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=WYCq8NkLGArYHEn1+YXD1iJHr4xilkpt05jtX2CfgMd+sXnHqJ9D+Ag24as8nGrTkm uUpU4XkNKOjJfkqFuhjHNbtFfmgdwqPyvzJanPJlu8vCQMKHrSYCCpg42vfA0sMxrSsi +vc9a5Kfp97IbTUpO9TgnGTJM6EgHUBUaWe7Y= Received: by 10.150.59.3 with SMTP id h3mr19621682yba.247.1281451224120; Tue, 10 Aug 2010 07:40:24 -0700 (PDT) Received: from localhost.localdomain (thief-statics-245.mncable.net [64.77.213.245]) by mx.google.com with ESMTPS id t20sm4108997ybm.17.2010.08.10.07.40.22 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 10 Aug 2010 07:40:23 -0700 (PDT) From: Robert Nelson To: tony@atomide.com Cc: linux-omap@vger.kernel.org, Robert Nelson Subject: [PATCH] ARM: OMAP: Beagle: support MMC gpio_wp differences on xM Date: Tue, 10 Aug 2010 09:40:16 -0500 Message-Id: <1281451216-23725-1-git-send-email-robertcnelson@gmail.com> X-Mailer: git-send-email 1.7.0.4 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]); Tue, 10 Aug 2010 14:50:18 +0000 (UTC) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 87969c7..15929be 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -185,7 +185,9 @@ static struct gpio_led gpio_leds[]; static int beagle_twl_gpio_setup(struct device *dev, unsigned gpio, unsigned ngpio) { - if (system_rev >= 0x20 && system_rev <= 0x34301000) { + if (cpu_is_omap3630()) { + mmc[0].gpio_wp = -EINVAL; + } else if (system_rev >= 0x20 && system_rev <= 0x34301000) { omap_mux_init_gpio(23, OMAP_PIN_INPUT); mmc[0].gpio_wp = 23; } else {