From patchwork Fri Aug 20 02:38:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Nelson X-Patchwork-Id: 120450 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 o7K2cvjj011828 for ; Fri, 20 Aug 2010 02:39:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751641Ab0HTCjB (ORCPT ); Thu, 19 Aug 2010 22:39:01 -0400 Received: from mail-gx0-f174.google.com ([209.85.161.174]:43344 "EHLO mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750898Ab0HTCjA (ORCPT ); Thu, 19 Aug 2010 22:39:00 -0400 Received: by gxk23 with SMTP id 23so1041711gxk.19 for ; Thu, 19 Aug 2010 19:38:59 -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=e8dJxDt9UPvxtOTF/rlI0PjPDyMFs4sAckFxLmAD8GI=; b=m/aEoCCzxE/J4azvA7m7FfNd7Uq7CXhLjb9q3528gz6CCrtXLgy0uWmksjeRzg52c3 sxksVtowwviH1tXjIC4Nlkabs9i5IIvq7ELkqAkbaIk70AOU9J3fH1pnBx3Ubw+aQoJ+ xrN+r/ZWm2pV0BwdHhxewFXsALlicMGVifdBY= 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=tzXg5W3ioxTA2eirHWHC4nfcluJG/Rqf2lI5V/KCshkI4V4CjmHPriRyYgpE8FmLLr OX86giEb9VtojQNjP9v7WmI1YwVDMZtukmMXjdj9O+kj6odsLVxAGLNWwwSC5Men3GBu 32f679W3iBFDw7TVmOKO+uJp2TqKBqxqXuMjo= Received: by 10.151.122.3 with SMTP id z3mr981444ybm.267.1282271939735; Thu, 19 Aug 2010 19:38:59 -0700 (PDT) Received: from localhost.localdomain (thief-pool1-30.mncable.net [64.77.208.30]) by mx.google.com with ESMTPS id m11sm3307701ybn.16.2010.08.19.19.38.57 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 19 Aug 2010 19:38:58 -0700 (PDT) From: Robert Nelson To: tony@atomide.com Cc: linux-omap@vger.kernel.org, Robert Nelson Subject: [PATCH v6 2/3] ARM: OMAP: Beagle: only Cx boards use pin 23 for write protect Date: Thu, 19 Aug 2010 21:38:45 -0500 Message-Id: <1282271926-2676-2-git-send-email-robertcnelson@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1282271926-2676-1-git-send-email-robertcnelson@gmail.com> References: <1282271926-2676-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, 20 Aug 2010 02:39:18 +0000 (UTC) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 62d69a9..e9af4fd 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -274,7 +274,8 @@ 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 ((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; } else {