From patchwork Wed Jan 13 11:41:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Hunter X-Patchwork-Id: 72612 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0DBfR6h025180 for ; Wed, 13 Jan 2010 11:41:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755939Ab0AMLl0 (ORCPT ); Wed, 13 Jan 2010 06:41:26 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755942Ab0AMLlZ (ORCPT ); Wed, 13 Jan 2010 06:41:25 -0500 Received: from smtp.nokia.com ([192.100.122.230]:21108 "EHLO mgw-mx03.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755941Ab0AMLlY (ORCPT ); Wed, 13 Jan 2010 06:41:24 -0500 Received: from vaebh106.NOE.Nokia.com (vaebh106.europe.nokia.com [10.160.244.32]) by mgw-mx03.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o0DBenQj021173; Wed, 13 Jan 2010 13:41:16 +0200 Received: from esebh102.NOE.Nokia.com ([172.21.138.183]) by vaebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 13 Jan 2010 13:41:15 +0200 Received: from mgw-da02.ext.nokia.com ([147.243.128.26]) by esebh102.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Wed, 13 Jan 2010 13:41:14 +0200 Received: from ahunter-work.research.nokia.com (esdhcp040224.research.nokia.com [172.21.40.224]) by mgw-da02.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o0DBf8jG003143; Wed, 13 Jan 2010 13:41:09 +0200 From: Adrian Hunter To: Tony Lindgren Cc: linux-mmc Mailing List , Adrian Hunter , linux-omap Mailing List , Andrew Morton , Madhusudhan Chikkature Date: Wed, 13 Jan 2010 13:41:09 +0200 Message-Id: <20100113114109.7615.56900.sendpatchset@ahunter-work.research.nokia.com> In-Reply-To: <20100113114010.7615.84920.sendpatchset@ahunter-work.research.nokia.com> References: <20100113114010.7615.84920.sendpatchset@ahunter-work.research.nokia.com> Subject: [PATCH 8/8] omap_hsmmc: allow for a shared VccQ X-OriginalArrivalTime: 13 Jan 2010 11:41:14.0624 (UTC) FILETIME=[4FD12000:01CA9445] X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c index 457ac48..bd8d19b 100644 --- a/arch/arm/mach-omap2/hsmmc.c +++ b/arch/arm/mach-omap2/hsmmc.c @@ -95,6 +95,9 @@ void __init omap2_hsmmc_init(struct omap2_hsmmc_info *controllers) if (c->no_off) mmc->slots[0].no_off = 1; + if (c->vcc_aux_disable_is_sleep) + mmc->slots[0].vcc_aux_disable_is_sleep = 1; + /* NOTE: MMC slots should have a Vcc regulator set up. * This may be from a TWL4030-family chip, another * controllable regulator, or a fixed supply. diff --git a/arch/arm/mach-omap2/hsmmc.h b/arch/arm/mach-omap2/hsmmc.h index 1887e4b..88e4459 100644 --- a/arch/arm/mach-omap2/hsmmc.h +++ b/arch/arm/mach-omap2/hsmmc.h @@ -15,6 +15,7 @@ struct omap2_hsmmc_info { bool nonremovable; /* Nonremovable e.g. eMMC */ bool power_saving; /* Try to sleep or power off when possible */ bool no_off; /* power_saving and power is not to go off */ + bool vcc_aux_disable_is_sleep; /* Regulator off remapped to sleep */ int gpio_cd; /* or -EINVAL */ int gpio_wp; /* or -EINVAL */ char *name; /* or NULL for default */ diff --git a/arch/arm/plat-omap/include/plat/mmc.h b/arch/arm/plat-omap/include/plat/mmc.h index b6cd39c..865644b 100644 --- a/arch/arm/plat-omap/include/plat/mmc.h +++ b/arch/arm/plat-omap/include/plat/mmc.h @@ -102,6 +102,9 @@ struct omap_mmc_platform_data { /* If using power_saving and the MMC power is not to go off */ unsigned no_off:1; + /* Regulator off remapped to sleep */ + unsigned vcc_aux_disable_is_sleep:1; + int switch_pin; /* gpio (card detect) */ int gpio_wp; /* gpio (write protect) */ diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 677be61..2b09659 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -425,7 +425,11 @@ static int omap_hsmmc_23_set_sleep(struct device *dev, int slot, int sleep, err = regulator_set_mode(host->vcc, mode); if (err) return err; - return regulator_set_mode(host->vcc_aux, mode); + + if (mmc_slot(host).vcc_aux_disable_is_sleep) + return regulator_disable(host->vcc_aux); + else + return regulator_set_mode(host->vcc_aux, mode); } static int omap_hsmmc_gpio_init(struct omap_mmc_platform_data *pdata)