| From d85ca2c63ef14f0af1ff528911fedc74bf22b0c6 Mon Sep 17 00:00:00 2001 |
| From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> |
| Date: Thu, 6 Jun 2013 16:35:48 +0200 |
| Subject: mmc: tmio: reset the controller after power-up |
| |
| This fixes two reported problems: |
| 1. after a system resume the controller isn't functioning until a command |
| runs on a timeout and a controller reset is performed. |
| 2. if a card is ejected during a running write operation, its re-insertion |
| isn't detected. |
| |
| Reported-by: Nguyen Viet Dung <nv-dung@jinso.co.jp> |
| Reported-by: Nguyen Hong Ky <nh-ky@jinso.co.jp> |
| Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com> |
| Tested-by: Nguyen Viet Dung <nv-dung@jinso.co.jp> |
| Tested-by: Nguyen Hong Ky <nh-ky@jinso.co.jp> |
| Signed-off-by: Chris Ball <cjb@laptop.org> |
| (cherry picked from commit b9ec2744128d0940342b236e9018614ba8848118) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/mmc/host/tmio_mmc_pio.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c |
| index 8e955ce2..1912d6f4 100644 |
| --- a/drivers/mmc/host/tmio_mmc_pio.c |
| +++ b/drivers/mmc/host/tmio_mmc_pio.c |
| @@ -867,6 +867,8 @@ static void tmio_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) |
| host->resuming = false; |
| } |
| } |
| + if (host->power == TMIO_MMC_OFF_STOP) |
| + tmio_mmc_reset(host); |
| tmio_mmc_set_clock(host, ios->clock); |
| if (host->power == TMIO_MMC_OFF_STOP) |
| /* power up SD card and the bus */ |
| @@ -1186,7 +1188,6 @@ int tmio_mmc_host_runtime_resume(struct device *dev) |
| struct mmc_host *mmc = dev_get_drvdata(dev); |
| struct tmio_mmc_host *host = mmc_priv(mmc); |
| |
| - tmio_mmc_reset(host); |
| tmio_mmc_enable_dma(host, true); |
| |
| return 0; |
| -- |
| 1.8.4.3.gca3854a |
| |
