|
@@ -167,11 +167,11 @@ static void tmio_mmc_clk_start(struct tmio_mmc_host *host)
|
|
|
|
|
|
/* HW engineers overrode docs: no sleep needed on R-Car2+ */
|
|
/* HW engineers overrode docs: no sleep needed on R-Car2+ */
|
|
if (!(host->pdata->flags & TMIO_MMC_MIN_RCAR2))
|
|
if (!(host->pdata->flags & TMIO_MMC_MIN_RCAR2))
|
|
- msleep(10);
|
|
|
|
|
|
+ usleep_range(10000, 11000);
|
|
|
|
|
|
if (host->pdata->flags & TMIO_MMC_HAVE_HIGH_REG) {
|
|
if (host->pdata->flags & TMIO_MMC_HAVE_HIGH_REG) {
|
|
sd_ctrl_write16(host, CTL_CLK_AND_WAIT_CTL, 0x0100);
|
|
sd_ctrl_write16(host, CTL_CLK_AND_WAIT_CTL, 0x0100);
|
|
- msleep(10);
|
|
|
|
|
|
+ usleep_range(10000, 11000);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -179,7 +179,7 @@ static void tmio_mmc_clk_stop(struct tmio_mmc_host *host)
|
|
{
|
|
{
|
|
if (host->pdata->flags & TMIO_MMC_HAVE_HIGH_REG) {
|
|
if (host->pdata->flags & TMIO_MMC_HAVE_HIGH_REG) {
|
|
sd_ctrl_write16(host, CTL_CLK_AND_WAIT_CTL, 0x0000);
|
|
sd_ctrl_write16(host, CTL_CLK_AND_WAIT_CTL, 0x0000);
|
|
- msleep(10);
|
|
|
|
|
|
+ usleep_range(10000, 11000);
|
|
}
|
|
}
|
|
|
|
|
|
sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, ~CLK_CTL_SCLKEN &
|
|
sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, ~CLK_CTL_SCLKEN &
|
|
@@ -187,7 +187,7 @@ static void tmio_mmc_clk_stop(struct tmio_mmc_host *host)
|
|
|
|
|
|
/* HW engineers overrode docs: no sleep needed on R-Car2+ */
|
|
/* HW engineers overrode docs: no sleep needed on R-Car2+ */
|
|
if (!(host->pdata->flags & TMIO_MMC_MIN_RCAR2))
|
|
if (!(host->pdata->flags & TMIO_MMC_MIN_RCAR2))
|
|
- msleep(10);
|
|
|
|
|
|
+ usleep_range(10000, 11000);
|
|
}
|
|
}
|
|
|
|
|
|
static void tmio_mmc_set_clock(struct tmio_mmc_host *host,
|
|
static void tmio_mmc_set_clock(struct tmio_mmc_host *host,
|
|
@@ -219,7 +219,7 @@ static void tmio_mmc_set_clock(struct tmio_mmc_host *host,
|
|
sd_ctrl_read16(host, CTL_SD_CARD_CLK_CTL));
|
|
sd_ctrl_read16(host, CTL_SD_CARD_CLK_CTL));
|
|
sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, clk & CLK_CTL_DIV_MASK);
|
|
sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, clk & CLK_CTL_DIV_MASK);
|
|
if (!(host->pdata->flags & TMIO_MMC_MIN_RCAR2))
|
|
if (!(host->pdata->flags & TMIO_MMC_MIN_RCAR2))
|
|
- msleep(10);
|
|
|
|
|
|
+ usleep_range(10000, 11000);
|
|
|
|
|
|
tmio_mmc_clk_start(host);
|
|
tmio_mmc_clk_start(host);
|
|
}
|
|
}
|
|
@@ -230,11 +230,11 @@ static void tmio_mmc_reset(struct tmio_mmc_host *host)
|
|
sd_ctrl_write16(host, CTL_RESET_SD, 0x0000);
|
|
sd_ctrl_write16(host, CTL_RESET_SD, 0x0000);
|
|
if (host->pdata->flags & TMIO_MMC_HAVE_HIGH_REG)
|
|
if (host->pdata->flags & TMIO_MMC_HAVE_HIGH_REG)
|
|
sd_ctrl_write16(host, CTL_RESET_SDIO, 0x0000);
|
|
sd_ctrl_write16(host, CTL_RESET_SDIO, 0x0000);
|
|
- msleep(10);
|
|
|
|
|
|
+ usleep_range(10000, 11000);
|
|
sd_ctrl_write16(host, CTL_RESET_SD, 0x0001);
|
|
sd_ctrl_write16(host, CTL_RESET_SD, 0x0001);
|
|
if (host->pdata->flags & TMIO_MMC_HAVE_HIGH_REG)
|
|
if (host->pdata->flags & TMIO_MMC_HAVE_HIGH_REG)
|
|
sd_ctrl_write16(host, CTL_RESET_SDIO, 0x0001);
|
|
sd_ctrl_write16(host, CTL_RESET_SDIO, 0x0001);
|
|
- msleep(10);
|
|
|
|
|
|
+ usleep_range(10000, 11000);
|
|
|
|
|
|
if (host->pdata->flags & TMIO_MMC_SDIO_IRQ) {
|
|
if (host->pdata->flags & TMIO_MMC_SDIO_IRQ) {
|
|
sd_ctrl_write16(host, CTL_SDIO_IRQ_MASK, host->sdio_irq_mask);
|
|
sd_ctrl_write16(host, CTL_SDIO_IRQ_MASK, host->sdio_irq_mask);
|