Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

[u-boot] / drivers / mmc / mxcmmc.c

diff --git a/drivers/mmc/mxcmmc.c b/drivers/mmc/mxcmmc.c
index 6282b236e41b6714e57ae1b0a535933f54401094..4f99617b9a948da3c9b4f66c5a765fa3904dfb43 100644 (file)
--- a/drivers/mmc/mxcmmc.c
+++ b/drivers/mmc/mxcmmc.c
@@ -25,9 +25,7 @@
 #include <mmc.h>
 #include <asm/errno.h>
 #include <asm/io.h>
-#ifdef CONFIG_MX27
 #include <asm/arch/clock.h>
-#endif
 
 #define DRIVER_NAME "mxc-mmc"
 
@@ -136,14 +134,14 @@ static void mxcmci_softreset(struct mxcmci_host *host)
        int i;
 
        /* reset sequence */
-       writew(STR_STP_CLK_RESET, &host->base->str_stp_clk);
-       writew(STR_STP_CLK_RESET | STR_STP_CLK_START_CLK,
+       writel(STR_STP_CLK_RESET, &host->base->str_stp_clk);
+       writel(STR_STP_CLK_RESET | STR_STP_CLK_START_CLK,
                        &host->base->str_stp_clk);
 
        for (i = 0; i < 8; i++)
-               writew(STR_STP_CLK_START_CLK, &host->base->str_stp_clk);
+               writel(STR_STP_CLK_START_CLK, &host->base->str_stp_clk);
 
-       writew(0xff, &host->base->res_to);
+       writel(0xff, &host->base->res_to);
 }
 
 static void mxcmci_setup_data(struct mxcmci_host *host, struct mmc_data *data)
@@ -154,8 +152,8 @@ static void mxcmci_setup_data(struct mxcmci_host *host, struct mmc_data *data)
 
        host->data = data;
 
-       writew(nob, &host->base->nob);
-       writew(blksz, &host->base->blk_len);
+       writel(nob, &host->base->nob);
+       writel(blksz, &host->base->blk_len);
        host->datasize = datasize;
 }
 
@@ -185,9 +183,9 @@ static int mxcmci_start_cmd(struct mxcmci_host *host, struct mmc_cmd *cmd,
                return -EINVAL;
        }
 
-       writew(cmd->cmdidx, &host->base->cmd);
+       writel(cmd->cmdidx, &host->base->cmd);
        writel(cmd->cmdarg, &host->base->arg);
-       writew(cmdat, &host->base->cmd_dat_cont);
+       writel(cmdat, &host->base->cmd_dat_cont);
 
        return 0;
 }
@@ -247,14 +245,14 @@ static int mxcmci_read_response(struct mxcmci_host *host, unsigned int stat)
        if (cmd->resp_type & MMC_RSP_PRESENT) {
                if (cmd->resp_type & MMC_RSP_136) {
                        for (i = 0; i < 4; i++) {
-                               a = readw(&host->base->res_fifo);
-                               b = readw(&host->base->res_fifo);
+                               a = readl(&host->base->res_fifo) & 0xFFFF;
+                               b = readl(&host->base->res_fifo) & 0xFFFF;
                                resp[i] = a << 16 | b;
                        }
                } else {
-                       a = readw(&host->base->res_fifo);
-                       b = readw(&host->base->res_fifo);
-                       c = readw(&host->base->res_fifo);
+                       a = readl(&host->base->res_fifo) & 0xFFFF;
+                       b = readl(&host->base->res_fifo) & 0xFFFF;
+                       c = readl(&host->base->res_fifo) & 0xFFFF;
                        resp[0] = a << 24 | b << 8 | c >> 8;
                }
        }
@@ -422,7 +420,7 @@ static void mxcmci_set_clk_rate(struct mxcmci_host *host, unsigned int clk_ios)
 {
        unsigned int divider;
        int prescaler = 0;
-       unsigned long clk_in = imx_get_perclk2();
+       unsigned long clk_in = mxc_get_clock(MXC_ESDHC_CLK);
 
        while (prescaler <= 0x800) {
                for (divider = 1; divider <= 0xF; divider++) {
@@ -445,7 +443,7 @@ static void mxcmci_set_clk_rate(struct mxcmci_host *host, unsigned int clk_ios)
                        prescaler <<= 1;
        }
 
-       writew((prescaler << 4) | divider, &host->base->clk_rate);
+       writel((prescaler << 4) | divider, &host->base->clk_rate);
 }
 
 static void mxcmci_set_ios(struct mmc *mmc)
@@ -458,9 +456,9 @@ static void mxcmci_set_ios(struct mmc *mmc)
 
        if (mmc->clock) {
                mxcmci_set_clk_rate(host, mmc->clock);
-               writew(STR_STP_CLK_START_CLK, &host->base->str_stp_clk);
+               writel(STR_STP_CLK_START_CLK, &host->base->str_stp_clk);
        } else {
-               writew(STR_STP_CLK_STOP_CLK, &host->base->str_stp_clk);
+               writel(STR_STP_CLK_STOP_CLK, &host->base->str_stp_clk);
        }
 
        host->clock = mmc->clock;
@@ -472,7 +470,7 @@ static int mxcmci_init(struct mmc *mmc)
 
        mxcmci_softreset(host);
 
-       host->rev_no = readw(&host->base->rev_no);
+       host->rev_no = readl(&host->base->rev_no);
        if (host->rev_no != 0x400) {
                printf("wrong rev.no. 0x%08x. aborting.\n",
                        host->rev_no);
@@ -480,7 +478,7 @@ static int mxcmci_init(struct mmc *mmc)
        }
 
        /* recommended in data sheet */
-       writew(0x2db4, &host->base->read_to);
+       writel(0x2db4, &host->base->read_to);
 
        writel(0, &host->base->int_cntr);
 
@@ -500,6 +498,8 @@ static int mxcmci_initialize(bd_t *bis)
        mmc->send_cmd = mxcmci_request;
        mmc->set_ios = mxcmci_set_ios;
        mmc->init = mxcmci_init;
+       mmc->getcd = NULL;
+       mmc->getwp = NULL;
        mmc->host_caps = MMC_MODE_4BIT;
 
        host->base = (struct mxcmci_regs *)CONFIG_MXC_MCI_REGS_BASE;
@@ -508,8 +508,10 @@ static int mxcmci_initialize(bd_t *bis)
 
        mmc->voltages = MMC_VDD_32_33 | MMC_VDD_33_34;
 
-       mmc->f_min = imx_get_perclk2() >> 7;
-       mmc->f_max = imx_get_perclk2() >> 1;
+       mmc->f_min = mxc_get_clock(MXC_ESDHC_CLK) >> 7;
+       mmc->f_max = mxc_get_clock(MXC_ESDHC_CLK) >> 1;
+
+       mmc->b_max = 0;
 
        mmc_register(mmc);
 
@@ -520,4 +522,3 @@ int mxc_mmc_init(bd_t *bis)
 {
        return mxcmci_initialize(bis);
 }
-