1 files changed, 6 insertions, 13 deletions

diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index 75a485448796..724b35e85a26 100644
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
@@ -286,7 +286,7 @@ static void sh_mmcif_start_dma_rx(struct sh_mmcif_host *host)
                          DMA_FROM_DEVICE);
         if (ret > 0) {
                 host->dma_active = true;
-                desc = chan->device->device_prep_slave_sg(chan, sg, ret,
+                desc = dmaengine_prep_slave_sg(chan, sg, ret,
                         DMA_DEV_TO_MEM, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
         }
 
@@ -335,7 +335,7 @@ static void sh_mmcif_start_dma_tx(struct sh_mmcif_host *host)
                          DMA_TO_DEVICE);
         if (ret > 0) {
                 host->dma_active = true;
-                desc = chan->device->device_prep_slave_sg(chan, sg, ret,
+                desc = dmaengine_prep_slave_sg(chan, sg, ret,
                         DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
         }
 
@@ -454,7 +454,8 @@ static void sh_mmcif_clock_control(struct sh_mmcif_host *host, unsigned int clk)
                 sh_mmcif_bitset(host, MMCIF_CE_CLK_CTRL, CLK_SUP_PCLK);
         else
                 sh_mmcif_bitset(host, MMCIF_CE_CLK_CTRL, CLK_CLEAR &
-                                ((fls(host->clk / clk) - 1) << 16));
+                                ((fls(DIV_ROUND_UP(host->clk,
+                                                   clk) - 1) - 1) << 16));
 
         sh_mmcif_bitset(host, MMCIF_CE_CLK_CTRL, CLK_ENABLE);
 }
@@ -746,7 +747,6 @@ static u32 sh_mmcif_set_cmd(struct sh_mmcif_host *host,
         case MMC_SET_WRITE_PROT:
         case MMC_CLR_WRITE_PROT:
         case MMC_ERASE:
-        case MMC_GEN_CMD:
                 tmp |= CMD_SET_RBSY;
                 break;
         }
@@ -829,7 +829,6 @@ static void sh_mmcif_start_cmd(struct sh_mmcif_host *host,
         case MMC_SET_WRITE_PROT:
         case MMC_CLR_WRITE_PROT:
         case MMC_ERASE:
-        case MMC_GEN_CMD:
                 mask = MASK_START_CMD | MASK_MRBSYE;
                 break;
         default:
@@ -1299,14 +1298,8 @@ static int __devinit sh_mmcif_probe(struct platform_device *pdev)
         spin_lock_init(&host->lock);
 
         mmc->ops = &sh_mmcif_ops;
-        mmc->f_max = host->clk;
-        /* close to 400KHz */
-        if (mmc->f_max < 51200000)
-                mmc->f_min = mmc->f_max / 128;
-        else if (mmc->f_max < 102400000)
-                mmc->f_min = mmc->f_max / 256;
-        else
-                mmc->f_min = mmc->f_max / 512;
+        mmc->f_max = host->clk / 2;
+        mmc->f_min = host->clk / 512;
         if (pd->ocr)
                 mmc->ocr_avail = pd->ocr;
         mmc->caps = MMC_CAP_MMC_HIGHSPEED;