lkml.org 
[lkml]   [2009]   [Jun]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/7] mmc: tmio_mmc: map SD control registers after enabling the MFD cell
    Date
    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>
    Cc: Pierre Ossman <pierre@ossman.eu>
    Cc: Ian Molton <spyro@f2s.com>
    ---
    drivers/mmc/host/tmio_mmc.c | 20 ++++++++++----------
    1 files changed, 10 insertions(+), 10 deletions(-)

    diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c
    index b576640..fe6d2b6 100644
    --- a/drivers/mmc/host/tmio_mmc.c
    +++ b/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);

    --
    1.6.3.1


    \
     
     \ /
      Last update: 2009-06-04 20:17    [W:4.074 / U:0.352 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site