arm: kirkwood: ib62x0: drop CONFIG_CMD_ENV define

[oweals/u-boot.git] / drivers / mmc / dw_mmc.c

diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
index a84c1e16d8b706332c86db4a439227d3601027cb..4375abc9406a904fcd85ce579347dc93e6758327 100644 (file)
--- a/drivers/mmc/dw_mmc.c
+++ b/drivers/mmc/dw_mmc.c
@@ -40,7 +40,7 @@ static void dwmci_set_idma_desc(struct dwmci_idmac *idmac,
        desc->flags = desc0;
        desc->cnt = desc1;
        desc->addr = desc2;
-       desc->next_addr = (unsigned int)desc + sizeof(struct dwmci_idmac);
+       desc->next_addr = (ulong)desc + sizeof(struct dwmci_idmac);
 }
 
 static void dwmci_prepare_data(struct dwmci_host *host,
@@ -58,7 +58,7 @@ static void dwmci_prepare_data(struct dwmci_host *host,
        dwmci_wait_reset(host, DWMCI_CTRL_FIFO_RESET);
 
        data_start = (ulong)cur_idmac;
-       dwmci_writel(host, DWMCI_DBADDR, (unsigned int)cur_idmac);
+       dwmci_writel(host, DWMCI_DBADDR, (ulong)cur_idmac);
 
        do {
                flags = DWMCI_IDMAC_OWN | DWMCI_IDMAC_CH ;
@@ -70,7 +70,7 @@ static void dwmci_prepare_data(struct dwmci_host *host,
                        cnt = data->blocksize * 8;
 
                dwmci_set_idma_desc(cur_idmac, flags, cnt,
-                                   (u32)bounce_buffer + (i * PAGE_SIZE));
+                                   (ulong)bounce_buffer + (i * PAGE_SIZE));
 
                if (blk_cnt <= 8)
                        break;
@@ -214,7 +214,7 @@ static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
 
        if (data) {
                start = get_timer(0);
-               timeout = 1000;
+               timeout = 240000;
                for (;;) {
                        mask = dwmci_readl(host, DWMCI_RINTSTS);
                        /* Error during data transfer. */