From patchwork Wed Jul 21 17:33:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ohad Ben Cohen X-Patchwork-Id: 113430 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 o6LHZfkW008354 for ; Wed, 21 Jul 2010 17:35:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761187Ab0GURfk (ORCPT ); Wed, 21 Jul 2010 13:35:40 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:59315 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761124Ab0GURf3 (ORCPT ); Wed, 21 Jul 2010 13:35:29 -0400 Received: by mail-bw0-f46.google.com with SMTP id 1so374531bwz.19 for ; Wed, 21 Jul 2010 10:35:28 -0700 (PDT) Received: by 10.204.19.208 with SMTP id c16mr418172bkb.30.1279733727925; Wed, 21 Jul 2010 10:35:27 -0700 (PDT) Received: from localhost.localdomain (93-172-119-238.bb.netvision.net.il [93.172.119.238]) by mx.google.com with ESMTPS id f10sm29348743bkl.5.2010.07.21.10.35.24 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 21 Jul 2010 10:35:27 -0700 (PDT) From: Ohad Ben-Cohen To: , , Cc: , , Chikkature Rajashekar Madhusudhan , Luciano Coelho , , San Mehat , Roger Quadros , Tony Lindgren , Nicolas Pitre , Pandita Vikram , Kalle Valo , Ohad Ben-Cohen Subject: [PATCH v2 19/20] omap: zoom: keep the MMC3 wl1271 device powered off Date: Wed, 21 Jul 2010 20:33:53 +0300 Message-Id: <1279733634-21974-20-git-send-email-ohad@wizery.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1279733634-21974-1-git-send-email-ohad@wizery.com> References: <1279733634-21974-1-git-send-email-ohad@wizery.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@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, 21 Jul 2010 17:35:42 +0000 (UTC) diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c index 3230801..3ab9125 100644 --- a/arch/arm/mach-omap2/board-zoom-peripherals.c +++ b/arch/arm/mach-omap2/board-zoom-peripherals.c @@ -217,6 +217,7 @@ static struct omap2_hsmmc_info mmc[] __initdata = { .gpio_wp = -EINVAL, .gpio_cd = -EINVAL, .ocr_mask = MMC_VDD_165_195, + .dont_power_card = true, .priv_data = &omap_zoom_wlan_data, }, {} /* Terminator */ diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c index f06ddd2..24c4144 100644 --- a/arch/arm/mach-omap2/hsmmc.c +++ b/arch/arm/mach-omap2/hsmmc.c @@ -284,6 +284,9 @@ void __init omap2_hsmmc_init(struct omap2_hsmmc_info *controllers) if (c->vcc_aux_disable_is_sleep) mmc->slots[0].vcc_aux_disable_is_sleep = 1; + if (c->dont_power_card) + mmc->slots[0].dont_power_card = 1; + mmc->slots[0].priv_data = c->priv_data; /* NOTE: MMC slots should have a Vcc regulator set up. diff --git a/arch/arm/mach-omap2/hsmmc.h b/arch/arm/mach-omap2/hsmmc.h index 434a3ed..e200786 100644 --- a/arch/arm/mach-omap2/hsmmc.h +++ b/arch/arm/mach-omap2/hsmmc.h @@ -23,6 +23,7 @@ struct omap2_hsmmc_info { int ocr_mask; /* temporary HACK */ /* Remux (pad configuation) when powering on/off */ void (*remux)(struct device *dev, int slot, int power_on); + bool dont_power_card;/* keep card power off at boot (default is n)*/ void *priv_data; /* private data to SDIO function driver */ }; diff --git a/arch/arm/plat-omap/include/plat/mmc.h b/arch/arm/plat-omap/include/plat/mmc.h index 9db1617..d042494 100644 --- a/arch/arm/plat-omap/include/plat/mmc.h +++ b/arch/arm/plat-omap/include/plat/mmc.h @@ -140,6 +140,9 @@ struct omap_mmc_platform_data { unsigned int ban_openended:1; + /* keep this card powered off at boot (default is n) */ + unsigned int dont_power_card:1; + /* card private data that should be used by function driver */ void *priv_data; } slots[OMAP_MMC_MAX_SLOTS]; diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 4ac548e..4fb6634 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -2157,6 +2157,9 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev) if (mmc_slot(host).nonremovable) mmc->caps |= MMC_CAP_NONREMOVABLE; + if (mmc_slot(host).dont_power_card) + mmc->caps |= MMC_CAP_DONT_POWER_CARD; + mmc_set_embedded_data(mmc, mmc_slot(host).priv_data); omap_hsmmc_conf_bus_power(host);