lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mmc: bfin_sdh: Reset SD controller when resume from power saving mode.

Browse Source 
Without reset, SD controller may stay in disable mode, SD card can't
be detected when resume from power saving mode.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
Sonic Zhang
2012-08-08 00:15:20 -04:00
committed by Chris Ball
parent c5e4a2e4c6
commit 7a8a43c46a
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/mmc/host/bfin_sdh.c
View File

@@ -505,6 +505,23 @@ static irqreturn_t sdh_stat_irq(int irq, void *devid)
return IRQ_RETVAL(handled); return IRQ_RETVAL(handled);
} }
static void sdh_reset(void)
{
#if defined(CONFIG_BF54x)
/* Secure Digital Host shares DMA with Nand controller */
bfin_write_DMAC1_PERIMUX(bfin_read_DMAC1_PERIMUX() | 0x1);
#endif
bfin_write_SDH_CFG(bfin_read_SDH_CFG() | CLKS_EN);
SSYNC();
/* Disable card inserting detection pin. set MMC_CAP_NEEDS_POLL, and
* mmc stack will do the detection.
*/
bfin_write_SDH_CFG((bfin_read_SDH_CFG() & 0x1F) | (PUP_SDDAT | PUP_SDDAT3));
SSYNC();
}
static int __devinit sdh_probe(struct platform_device *pdev) static int __devinit sdh_probe(struct platform_device *pdev)
{ {
struct mmc_host *mmc; struct mmc_host *mmc;
@@ -581,19 +598,8 @@ static int __devinit sdh_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "unable to request peripheral pins\n"); dev_err(&pdev->dev, "unable to request peripheral pins\n");
goto out4; goto out4;
} }
#if defined(CONFIG_BF54x)
/* Secure Digital Host shares DMA with Nand controller */
bfin_write_DMAC1_PERIMUX(bfin_read_DMAC1_PERIMUX() | 0x1);
#endif
bfin_write_SDH_CFG(bfin_read_SDH_CFG() | CLKS_EN); sdh_reset();
SSYNC();
/* Disable card inserting detection pin. set MMC_CAP_NEEDS_POLL, and
* mmc stack will do the detection.
*/
bfin_write_SDH_CFG((bfin_read_SDH_CFG() & 0x1F) | (PUP_SDDAT | PUP_SDDAT3));
SSYNC();
mmc_add_host(mmc); mmc_add_host(mmc);
return 0; return 0;
@@ -660,10 +666,7 @@ static int sdh_resume(struct platform_device *dev)
return ret; return ret;
} }
#if defined(CONFIG_BF54x) sdh_reset();
/* Secure Digital Host shares DMA with Nand controller */
bfin_write_DMAC1_PERIMUX(bfin_read_DMAC1_PERIMUX() | 0x1);
#endif
if (mmc) if (mmc)
ret = mmc_resume_host(mmc); ret = mmc_resume_host(mmc);