From patchwork Tue Jan  4 22:13:27 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Ohad Ben Cohen <ohad@wizery.com>
X-Patchwork-Id: 451871
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p04MDm6u028569
	for <patchwork-linux-mmc@patchwork.kernel.org>;
	Tue, 4 Jan 2011 22:13:48 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751010Ab1ADWNs (ORCPT
	<rfc822;patchwork-linux-mmc@patchwork.kernel.org>);
	Tue, 4 Jan 2011 17:13:48 -0500
Received: from mail-iw0-f194.google.com ([209.85.214.194]:38500 "EHLO
	mail-iw0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1750801Ab1ADWNr convert rfc822-to-8bit (ORCPT
	<rfc822;linux-mmc@vger.kernel.org>); Tue, 4 Jan 2011 17:13:47 -0500
Received: by iwn42 with SMTP id 42so7497837iwn.1
	for <linux-mmc@vger.kernel.org>; Tue, 04 Jan 2011 14:13:47 -0800 (PST)
Received: by 10.231.34.205 with SMTP id m13mr6112038ibd.184.1294179227182;
	Tue, 04 Jan 2011 14:13:47 -0800 (PST)
MIME-Version: 1.0
Received: by 10.231.117.230 with HTTP; Tue, 4 Jan 2011 14:13:27 -0800 (PST)
X-Originating-IP: [93.172.227.56]
In-Reply-To: <4D239AAF.6090202@csr.com>
References: <1294175416-12358-1-git-send-email-ohad@wizery.com>
	<1294175416-12358-3-git-send-email-ohad@wizery.com>
	<4D239AAF.6090202@csr.com>
From: Ohad Ben-Cohen <ohad@wizery.com>
Date: Wed, 5 Jan 2011 00:13:27 +0200
Message-ID: <AANLkTikKDkE8eoRct_DN++dRTZ8uEMqUKN2GZdCngRKQ@mail.gmail.com>
Subject: Re: [PATCH 3/4] mmc: add MMC_QUIRK_DISABLE_CD
To: David Vrabel <david.vrabel@csr.com>
Cc: linux-mmc@vger.kernel.org, Chris Ball <cjb@laptop.org>
Sender: linux-mmc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-mmc.vger.kernel.org>
X-Mailing-List: linux-mmc@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Tue, 04 Jan 2011 22:13:48 +0000 (UTC)


diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c
b/arch/arm/mach-omap2/board-zoom-peripherals.c
index 9db9203..ae69ba9 100644
--- a/arch/arm/mach-omap2/board-zoom-peripherals.c
+++ b/arch/arm/mach-omap2/board-zoom-peripherals.c
@@ -19,6 +19,7 @@
 #include <linux/regulator/fixed.h>
 #include <linux/wl12xx.h>
 #include <linux/mmc/host.h>
+#include <linux/mmc/card.h>

 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -196,6 +197,18 @@ struct wl12xx_platform_data omap_zoom_wlan_data
__initdata = {
        .board_ref_clock = 1,
 };

+static void zoom_wl1271_init_card(struct mmc_card *card)
+{
+       /*
+        * Tell SDIO core to disconnect the pull-up resistor on CD/DAT[3]
+        * (pin 1) of the wl1271 card, which is not required since we
+        * already have OMAP pulling up this line, and we don't need any
+        * card detection functionality. As a result, this may save some
+        * power.
+        */
+       card->quirks |= MMC_QUIRK_DISABLE_CD;
+}
+
 static struct omap2_hsmmc_info mmc[] __initdata = {
        {