From patchwork Mon Aug 16 14:36: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: 119713 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 o7GEbbGv021835 for ; Mon, 16 Aug 2010 14:37:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754499Ab0HPOhW (ORCPT ); Mon, 16 Aug 2010 10:37:22 -0400 Received: from mail-gy0-f174.google.com ([209.85.160.174]:49090 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754262Ab0HPOhT (ORCPT ); Mon, 16 Aug 2010 10:37:19 -0400 Received: by gyg10 with SMTP id 10so1867808gyg.19 for ; Mon, 16 Aug 2010 07:37:18 -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=bt9rFVFvPk/EOwj6cfgt0yvJj0ewjTjWtBlIql4jHvoYQhsc01ofx7UtP/A7N9FhKg fm6QFqCVclGvR2sG6OaGldwxU1M0ZL6aUnZy0KUeZRjTIkSmLwzJSOlX17sqiysek/e3 oK8ypZp2ODh2N4ckROb+j/1F9xkFynA5l6Xuw= 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=YbS5EJ7DJ186bu7gtO1emjt7T9G9ZHy1acwIAZ8vZRnHe/kapHHEB+5wi7V1rw7l+Q fWr4Vz7ckh+k6TsYpUogn242sTE12OyN2TLwbLUapJ01+j7hUifQSb1j/VTAM9DQh1Ch BZt0ttPVMGaQOcZmMYGyqi8WcoLwpcRAdYnpw= Received: by 10.101.175.9 with SMTP id c9mr5909491anp.3.1281969438328; Mon, 16 Aug 2010 07:37:18 -0700 (PDT) Received: from localhost.localdomain (thief-statics-245.mncable.net [64.77.213.245]) by mx.google.com with ESMTPS id 14sm10489967ant.21.2010.08.16.07.37.16 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 16 Aug 2010 07:37:17 -0700 (PDT) From: Robert Nelson To: tony@atomide.com Cc: linux-omap@vger.kernel.org, Robert Nelson Subject: [PATCH v4 2/3] ARM: OMAP: Beagle: only Cx boards use pin 23 for write protect Date: Mon, 16 Aug 2010 09:36:42 -0500 Message-Id: <1281969403-28312-2-git-send-email-robertcnelson@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1281969403-28312-1-git-send-email-robertcnelson@gmail.com> References: <1281969403-28312-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]); Mon, 16 Aug 2010 14: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 {