From: Kishon Vijay Abraham I <kishon@ti.com>
To: ulf.hansson@linaro.org, afenkart@gmail.com, tony@atomide.com,
linux-mmc@vger.kernel.org, linux-omap@vger.kernel.org,
linux-kernel@vger.kernel.org, nsekhar@ti.com
Cc: neilb@suse.de, kishon@ti.com
Subject: [PATCH v3 10/15] mmc: host: omap_hsmmc: avoid pbias regulator enable on power off
Date: Thu, 27 Aug 2015 14:44:02 +0530 [thread overview]
Message-ID: <1440666847-12594-11-git-send-email-kishon@ti.com> (raw)
In-Reply-To: <1440666847-12594-1-git-send-email-kishon@ti.com>
Fix omap_hsmmc_set_power so that pbias regulator is not enabled
during power off.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Tested-by: Tony Lindgren <tony@atomide.com>
---
drivers/mmc/host/omap_hsmmc.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 810d612..eec6975 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -388,16 +388,16 @@ static int omap_hsmmc_set_power(struct device *dev, int power_on, int vdd)
ret = omap_hsmmc_enable_supply(mmc, vdd);
if (ret)
return ret;
+
+ ret = omap_hsmmc_set_pbias(host, true, vdd);
+ if (ret)
+ goto err_set_voltage;
} else {
ret = omap_hsmmc_disable_supply(mmc);
if (ret)
return ret;
}
- ret = omap_hsmmc_set_pbias(host, true, vdd);
- if (ret)
- goto err_set_voltage;
-
if (mmc_pdata(host)->after_set_reg)
mmc_pdata(host)->after_set_reg(dev, power_on, vdd);
--
1.7.9.5
next prev parent reply other threads:[~2015-08-27 9:14 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-27 9:13 [PATCH v3 00/15] omap_hsmmc: regulator usage cleanup and fixes Kishon Vijay Abraham I
2015-08-27 9:13 ` [PATCH v3 01/15] mmc: host: omap_hsmmc: use devm_regulator_get_optional() for vmmc Kishon Vijay Abraham I
2015-08-27 9:13 ` [PATCH v3 02/15] mmc: host: omap_hsmmc: return on fatal errors from omap_hsmmc_reg_get Kishon Vijay Abraham I
2015-08-28 18:07 ` Olof Johansson
2015-08-28 19:03 ` Tony Lindgren
2015-08-31 5:44 ` Kishon Vijay Abraham I
2015-08-31 20:58 ` Tony Lindgren
2015-08-31 21:14 ` Tony Lindgren
2015-09-01 14:33 ` Grygorii Strashko
2015-09-01 14:50 ` Tony Lindgren
2015-09-01 14:54 ` Grygorii Strashko
2015-09-01 15:03 ` Tony Lindgren
2015-09-10 16:59 ` Kevin Hilman
2015-09-10 20:45 ` Tony Lindgren
2015-08-27 9:13 ` [PATCH v3 03/15] mmc: host: omap_hsmmc: cleanup omap_hsmmc_reg_get() Kishon Vijay Abraham I
2015-08-27 9:13 ` [PATCH v3 04/15] mmc: host: omap_hsmmc: use the ocrmask provided by the vmmc regulator Kishon Vijay Abraham I
2015-08-27 9:13 ` [PATCH v3 05/15] mmc: host: omap_hsmmc: use mmc_host's vmmc and vqmmc Kishon Vijay Abraham I
2015-08-27 9:13 ` [PATCH v3 06/15] mmc: host: omap_hsmmc: remove unnecessary pbias set_voltage Kishon Vijay Abraham I
2015-08-27 9:13 ` [PATCH v3 07/15] mmc: host: omap_hsmmc: return error if any of the regulator APIs fail Kishon Vijay Abraham I
2015-08-27 9:14 ` [PATCH v3 08/15] mmc: host: omap_hsmmc: add separate functions for enable/disable supply Kishon Vijay Abraham I
2015-08-27 9:14 ` [PATCH v3 09/15] mmc: host: omap_hsmmc: add separate function to set pbias Kishon Vijay Abraham I
2015-08-27 9:14 ` Kishon Vijay Abraham I [this message]
2015-08-27 9:14 ` [PATCH v3 11/15] mmc: host: omap_hsmmc: don't use ->set_power to set initial regulator state Kishon Vijay Abraham I
2015-08-27 9:14 ` [PATCH v3 12/15] mmc: host: omap_hsmmc: enable/disable vmmc_aux regulator based on previous state Kishon Vijay Abraham I
2015-08-27 9:14 ` [PATCH v3 13/15] mmc: host: omap_hsmmc: use regulator_is_enabled to find pbias status Kishon Vijay Abraham I
2015-08-27 12:41 ` Ulf Hansson
2015-08-27 12:42 ` Ulf Hansson
2015-08-27 12:47 ` Kishon Vijay Abraham I
2015-08-27 12:49 ` Ulf Hansson
2015-08-27 9:14 ` [PATCH v3 14/15] mmc: host: omap_hsmmc: use ios->vdd for setting vmmc voltage Kishon Vijay Abraham I
2015-08-27 9:14 ` [PATCH v3 15/15] mmc: host: omap_hsmmc: remove CONFIG_REGULATOR check Kishon Vijay Abraham I
2015-08-27 13:09 ` [PATCH v3 00/15] omap_hsmmc: regulator usage cleanup and fixes Ulf Hansson
2015-08-27 13:20 ` Kishon Vijay Abraham I
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=1440666847-12594-11-git-send-email-kishon@ti.com \
--to=kishon@ti.com \
--cc=afenkart@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=neilb@suse.de \
--cc=nsekhar@ti.com \
--cc=tony@atomide.com \
--cc=ulf.hansson@linaro.org \
/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