From patchwork Fri Aug 13 12:21:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Nelson X-Patchwork-Id: 119413 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 o7DCLPwI013100 for ; Fri, 13 Aug 2010 12:21:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934239Ab0HMMVY (ORCPT ); Fri, 13 Aug 2010 08:21:24 -0400 Received: from mail-gy0-f174.google.com ([209.85.160.174]:50921 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934235Ab0HMMVY (ORCPT ); Fri, 13 Aug 2010 08:21:24 -0400 Received: by gyg10 with SMTP id 10so889932gyg.19 for ; Fri, 13 Aug 2010 05:21:23 -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=JOmMLue8U6m/ZX5f2s3Nku7L6MPNaOTtHMXlD5WYuVfZW4Pog0GgOb3SbCy3A7qKI3 2t20DHOv/lS3HYlrZwFVVN2ul4CFh0PBPKyQk6pglZvSHBg15Jj9Ost38V3WwoY71YQ9 +nODztSoNzmtjTUW7b1dsEeM7DQUvOPQXcXZE= 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=QoL4nxmsqBmzd0/e2qcp6flp8nDQOooR46rSb/spoAqBxh6/relCjMPkVK9IbPEj33 OwEzLnbRf7jItvHERengHgTEJ/nsM54VRFXVIsPEC4vNvIrqNyHMJWvUP797eVNZaQkm K20WocxUUgsFbQDIF2aDxDf6VoQC/BqavoYvA= Received: by 10.150.189.9 with SMTP id m9mr1888584ybf.162.1281702083300; Fri, 13 Aug 2010 05:21:23 -0700 (PDT) Received: from localhost.localdomain (thief-pool1-30.mncable.net [64.77.208.30]) by mx.google.com with ESMTPS id p14sm2833238ybb.9.2010.08.13.05.21.21 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 13 Aug 2010 05:21:22 -0700 (PDT) From: Robert Nelson To: tony@atomide.com Cc: linux-omap@vger.kernel.org, Robert Nelson Subject: [PATCH v3 2/3] ARM: OMAP: Beagle: only Cx boards use pin 23 for write protect Date: Fri, 13 Aug 2010 07:21:09 -0500 Message-Id: <1281702070-10525-2-git-send-email-robertcnelson@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1281702070-10525-1-git-send-email-robertcnelson@gmail.com> References: <1281702070-10525-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, 13 Aug 2010 12:21:26 +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 {