disk/part.c: Make features optional

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

diff --git a/drivers/mmc/gen_atmel_mci.c b/drivers/mmc/gen_atmel_mci.c
index fa4df9943a7906481b94f3d83db199b43791bbe4..d217574b57f7a3b0f34259a5c7616753d838ce28 100644 (file)
--- a/drivers/mmc/gen_atmel_mci.c
+++ b/drivers/mmc/gen_atmel_mci.c
@@ -33,7 +33,7 @@
 #include <asm/errno.h>
 #include <asm/byteorder.h>
 #include <asm/arch/clk.h>
-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>
 #include "atmel_mci.h"
 
 #ifndef CONFIG_SYS_MMC_CLK_OD
@@ -183,6 +183,10 @@ mci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data)
        /* Figure out the transfer arguments */
        cmdr = mci_encode_cmd(cmd, data, &error_flags);
 
+       if (data)
+               writel(MMCI_BF(BCNT, data->blocks) |
+                       MMCI_BF(BLKLEN, mmc->read_bl_len), &mci->blkr);
+
        /* Send the command */
        writel(cmd->cmdarg, &mci->argr);
        writel(cmdr, &mci->cmdr);
@@ -308,6 +312,7 @@ static int mci_init(struct mmc *mmc)
        writel(MMCI_BIT(SWRST), &mci->cr);      /* soft reset */
        writel(MMCI_BIT(PWSDIS), &mci->cr);     /* disable power save */
        writel(MMCI_BIT(MCIEN), &mci->cr);      /* enable mci */
+       writel(MMCI_BF(SCDSEL, MCI_BUS), &mci->sdcr);   /* select port */
 
        /* Initial Time-outs */
        writel(0x5f, &mci->dtor);
@@ -347,6 +352,8 @@ int atmel_mci_init(void *regs)
        mmc->f_min = get_mci_clk_rate() / (2*256);
        mmc->f_max = get_mci_clk_rate() / (2*1);
 
+       mmc->b_max = 0;
+
        mmc_register(mmc);
 
        return 0;