mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
tmio_mmc: map SD control registers after enabling the MFD cell
ASIC3 can disable the memory, so we need to wait for mfd_cell->enable to enable the memory before we can map the SD control registers. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Acked-by: Ian Molton <ian@mnementh.co.uk> Signed-off-by: Pierre Ossman <pierre@ossman.eu>
This commit is contained in:
parent
d6c9b5ed37
commit
544f277bb8
1 changed files with 10 additions and 10 deletions
|
@ -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);
|
||||
|
||||
|
|
Loading…
Reference in a new issue