From: Ohad Ben-Cohen <ohad@wizery.com>
To: <linux-wireless@vger.kernel.org>, <linux-mmc@vger.kernel.org>,
<linux-omap@vger.kernel.org>
Cc: <linux-arm-kernel@lists.infradead.org>, <linux@arm.linux.org.uk>,
Chikkature Rajashekar Madhusudhan <madhu.cr@ti.com>,
Luciano Coelho <luciano.coelho@nokia.com>,
<akpm@linux-foundation.org>, San Mehat <san@google.com>,
Roger Quadros <roger.quadros@nokia.com>,
Tony Lindgren <tony@atomide.com>,
Nicolas Pitre <nico@fluxnic.net>,
Pandita Vikram <vikram.pandita@ti.com>,
Kalle Valo <kalle.valo@iki.fi>, Ohad Ben-Cohen <ohad@wizery.com>
Subject: [PATCH v2 19/20] omap: zoom: keep the MMC3 wl1271 device powered off
Date: Wed, 21 Jul 2010 20:33:53 +0300 [thread overview]
Message-ID: <1279733634-21974-20-git-send-email-ohad@wizery.com> (raw)
In-Reply-To: <1279733634-21974-1-git-send-email-ohad@wizery.com>
Keep the MMC3 wl1271 WLAN device powered off until its
SDIO function driver requests otherwise.
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
---
arch/arm/mach-omap2/board-zoom-peripherals.c | 1 +
arch/arm/mach-omap2/hsmmc.c | 3 +++
arch/arm/mach-omap2/hsmmc.h | 1 +
arch/arm/plat-omap/include/plat/mmc.h | 3 +++
drivers/mmc/host/omap_hsmmc.c | 3 +++
5 files changed, 11 insertions(+), 0 deletions(-)
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);
--
1.7.0.4
next prev parent reply other threads:[~2010-07-21 17:35 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-21 17:33 [PATCH v2 00/20] native support for wl1271 on ZOOM Ohad Ben-Cohen
2010-07-21 17:33 ` [PATCH v2 01/20] sdio: add TI + wl1271 ids Ohad Ben-Cohen
2010-07-21 17:58 ` Marcel Holtmann
2010-07-22 23:38 ` Ohad Ben-Cohen
2010-07-21 17:33 ` [PATCH v2 02/20] wireless: wl1271: remove SDIO IDs from driver Ohad Ben-Cohen
2010-07-21 17:33 ` [PATCH v2 03/20] mmc: support embedded data field in mmc_host Ohad Ben-Cohen
2010-07-28 19:47 ` Vitaly Wool
2010-07-29 6:00 ` Ohad Ben-Cohen
2010-07-29 16:16 ` Vitaly Wool
2010-08-02 15:54 ` Ohad Ben-Cohen
2010-08-02 16:25 ` Vitaly Wool
2010-08-02 21:35 ` Ohad Ben-Cohen
2010-08-03 14:17 ` Vitaly Wool
2010-08-04 11:24 ` Ohad Ben-Cohen
2010-08-04 11:41 ` Russell King - ARM Linux
2010-08-04 12:42 ` Ohad Ben-Cohen
2010-08-04 14:01 ` Vitaly Wool
2010-08-06 7:07 ` Linus Walleij
2010-08-06 10:02 ` Ohad Ben-Cohen
2010-08-06 14:46 ` Russell King - ARM Linux
2010-08-06 16:53 ` Nicolas Pitre
2010-07-21 17:33 ` [PATCH v2 04/20] omap zoom2: wlan board muxing Ohad Ben-Cohen
2010-07-21 17:33 ` [PATCH v2 05/20] omap zoom3: " Ohad Ben-Cohen
2010-07-21 17:33 ` [PATCH v2 06/20] wireless: wl1271: make wl12xx.h common to both spi and sdio Ohad Ben-Cohen
2010-07-21 17:33 ` [PATCH v2 07/20] wireless: wl1271: support return value for the set power func Ohad Ben-Cohen
2010-07-21 17:33 ` [PATCH v2 08/20] wireless: wl1271: take irq info from private board data Ohad Ben-Cohen
2010-07-21 17:33 ` [PATCH v2 09/20] wireless: wl1271: make ref_clock configurable by board Ohad Ben-Cohen
2010-07-21 17:33 ` [PATCH v2 10/20] omap: zoom: add fixed regulator device for wlan Ohad Ben-Cohen
2010-07-21 17:59 ` Mark Brown
2010-07-22 11:16 ` Roger Quadros
2010-07-22 23:13 ` Ohad Ben-Cohen
2010-07-23 9:15 ` Mark Brown
2010-07-25 10:40 ` Ohad Ben-Cohen
2010-07-21 17:33 ` [PATCH v2 11/20] omap: hsmmc: support mmc3 regulator power control Ohad Ben-Cohen
2010-07-21 17:33 ` [PATCH v2 12/20] omap: hsmmc: allow board-specific settings of private mmc data Ohad Ben-Cohen
2010-07-21 17:33 ` [PATCH v2 13/20] omap: zoom: add mmc3/wl1271 device support Ohad Ben-Cohen
2010-07-21 17:33 ` [PATCH v2 14/20] mmc: sdio: fully reconfigure oldcard on resume Ohad Ben-Cohen
2010-07-21 17:33 ` [PATCH v2 15/20] mmc: sdio: verify existence of resume handler Ohad Ben-Cohen
2010-07-21 17:33 ` [PATCH v2 16/20] mmc: introduce API to control the card's power Ohad Ben-Cohen
2010-07-21 17:33 ` [PATCH v2 17/20] mmc: sdio: relocate sdio_set_block_size call Ohad Ben-Cohen
2010-07-21 17:33 ` [PATCH v2 18/20] mmc: sdio: enable a default power off mode of the card Ohad Ben-Cohen
2010-07-22 11:35 ` Roger Quadros
2010-07-25 12:40 ` Ohad Ben-Cohen
2010-07-25 13:56 ` Nicolas Pitre
2010-07-25 14:05 ` Ohad Ben-Cohen
2010-07-21 17:33 ` Ohad Ben-Cohen [this message]
2010-07-21 18:55 ` [PATCH v2 19/20] omap: zoom: keep the MMC3 wl1271 device powered off Gabay, Benzy
2010-07-22 23:18 ` Ohad Ben-Cohen
2010-07-26 18:33 ` Gabay, Benzy
2010-07-21 17:33 ` [PATCH v2 20/20] wireless: wl1271: call SDIO claim/release power API Ohad Ben-Cohen
2010-07-22 22:56 ` [PATCH v2 00/20] native support for wl1271 on ZOOM Nicolas Pitre
2010-07-22 23:56 ` Ohad Ben-Cohen
2010-07-26 19:30 ` John W. Linville
2010-07-27 9:32 ` Ohad Ben-Cohen
2010-08-02 8:16 ` Luciano Coelho
2010-08-02 11:42 ` Tony Lindgren
2010-08-02 12:08 ` Ohad Ben-Cohen
2010-08-02 15:12 ` Vitaly Wool
2010-08-02 15:59 ` Ohad Ben-Cohen
2010-08-02 16:19 ` Vitaly Wool
2010-08-02 16:40 ` Ohad Ben-Cohen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1279733634-21974-20-git-send-email-ohad@wizery.com \
--to=ohad@wizery.com \
--cc=akpm@linux-foundation.org \
--cc=kalle.valo@iki.fi \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=luciano.coelho@nokia.com \
--cc=madhu.cr@ti.com \
--cc=nico@fluxnic.net \
--cc=roger.quadros@nokia.com \
--cc=san@google.com \
--cc=tony@atomide.com \
--cc=vikram.pandita@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).