From patchwork Wed Aug 11 23:37:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Nelson X-Patchwork-Id: 118919 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 o7BNbuBa024426 for ; Wed, 11 Aug 2010 23:37:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757870Ab0HKXhz (ORCPT ); Wed, 11 Aug 2010 19:37:55 -0400 Received: from mail-gx0-f174.google.com ([209.85.161.174]:52770 "EHLO mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757391Ab0HKXhz (ORCPT ); Wed, 11 Aug 2010 19:37:55 -0400 Received: by gxk23 with SMTP id 23so209953gxk.19 for ; Wed, 11 Aug 2010 16:37:54 -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=oefY1CA63VcA815OV1bin4+T3DdQN0a1f3gx/PdiJjo=; b=pF8lt9gPl0iKbHmEtZhQ2pvCsivJ/dykgX+DqDqtCG8H9dlKO0oSHw7sh2rj6gOEil hUwVE3imo3dSX3W+ykHJFFlFK58NkXSmgmhfhQ5PdLMIHt8ROJtYCw6fkvUCKLor6RcB kYnNWqzTy1eB3zy3uzCraQk+U1o0+REf7G9yk= 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=tqy26qPe3qk0GgjmJcnJTGLLIm9ApGcTpYFgE/XmvDStsFUBNM/W1sDEd0C1+Ez+RQ /f8OlcOcfxs4uY9xAtel8mfTCIvll8OyNiWn9MbbtX4P7JJoArgA0ji5qv4tsKmJrkhH MAQc3rquD/JldUsfLutEH0YnVA6fuNgqKUfmc= Received: by 10.150.66.14 with SMTP id o14mr22075266yba.125.1281569874429; Wed, 11 Aug 2010 16:37:54 -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.52 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 11 Aug 2010 16:37:53 -0700 (PDT) From: Robert Nelson To: tony@atomide.com Cc: linux-omap@vger.kernel.org, Robert Nelson Subject: [PATCH v2 2/3] ARM: OMAP: Beagle: only Cx boards use pin 23 for write protect Date: Wed, 11 Aug 2010 18:37:41 -0500 Message-Id: <1281569862-19894-2-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:56 +0000 (UTC) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index e470336..08fa68f 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -244,7 +244,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 ((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; } else {