From 0da951b82b78418d465459d65c95be12b298ad42 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 4 Jun 2009 20:12:35 +0200 Subject: [PATCH] --- yaml --- r: 149471 b: refs/heads/master c: 544f277bb849da0ba86cfc4203a4c9139e2cd927 h: refs/heads/master i: 149469: 5122b2c1600664fe37a5f4ce6de6ec0fc93b05dc 149467: 5b0472a41f007a963d3c6742a7813e7554ba771a 149463: f0902d67e6f35abaf1dd9441376f53f9da6343c2 149455: 30189382750cb6da67d6ee49aaadc9c9d8c6b1fa 149439: 39bb2e8ccb716cf03c2906b9a0fd0f95de663a0a v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/tmio_mmc.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 8ca299cea361..f35586011187 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6c9b5ed37c26503795d241474a17db1d306e7ea +refs/heads/master: 544f277bb849da0ba86cfc4203a4c9139e2cd927 diff --git a/trunk/drivers/mmc/host/tmio_mmc.c b/trunk/drivers/mmc/host/tmio_mmc.c index b57664070485..fe6d2b6c0161 100644 --- a/trunk/drivers/mmc/host/tmio_mmc.c +++ b/trunk/drivers/mmc/host/tmio_mmc.c @@ -493,11 +493,6 @@ static int tmio_mmc_resume(struct platform_device *dev) struct tmio_mmc_host *host = mmc_priv(mmc); int ret = 0; - /* Enable the MMC/SD Control registers */ - sd_config_write16(host, CNF_CMD, SDCREN); - sd_config_write32(host, CNF_CTL_BASE, - (dev->resource[0].start >> host->bus_shift) & 0xfffe); - /* Tell the MFD core we are ready to be enabled */ if (cell->enable) { ret = cell->enable(dev); @@ -505,6 +500,11 @@ static int tmio_mmc_resume(struct platform_device *dev) goto out; } + /* Enable the MMC/SD Control registers */ + sd_config_write16(host, CNF_CMD, SDCREN); + sd_config_write32(host, CNF_CTL_BASE, + (dev->resource[0].start >> host->bus_shift) & 0xfffe); + mmc_resume_host(mmc); out: @@ -563,11 +563,6 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev) mmc->f_min = mmc->f_max / 512; mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34; - /* Enable the MMC/SD Control registers */ - sd_config_write16(host, CNF_CMD, SDCREN); - sd_config_write32(host, CNF_CTL_BASE, - (dev->resource[0].start >> host->bus_shift) & 0xfffe); - /* Tell the MFD core we are ready to be enabled */ if (cell->enable) { ret = cell->enable(dev); @@ -575,6 +570,11 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev) goto unmap_cnf; } + /* Enable the MMC/SD Control registers */ + sd_config_write16(host, CNF_CMD, SDCREN); + sd_config_write32(host, CNF_CTL_BASE, + (dev->resource[0].start >> host->bus_shift) & 0xfffe); + /* Disable SD power during suspend */ sd_config_write8(host, CNF_PWR_CTL_3, 0x01);