summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-03-27 21:20:29 +0200
committerWolfgang Denk <wd@denx.de>2011-03-27 21:20:29 +0200
commitc04bf5e9a45d7335681352faa125193258f8e976 (patch)
treeab512a5a8356b6f492100925acb63638a7c10ce9 /drivers
parentb0c5ceb305054aadf2f810b0b7bfcc94926b78ad (diff)
parent05858736f5f1050d776571451995db81e3f5a5d7 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/s5p_mmc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/s5p_mmc.c b/drivers/mmc/s5p_mmc.c
index 195b5be39e..0323800711 100644
--- a/drivers/mmc/s5p_mmc.c
+++ b/drivers/mmc/s5p_mmc.c
@@ -51,7 +51,7 @@ static void mmc_prepare_data(struct mmc_host *host, struct mmc_data *data)
writeb(ctrl, &host->reg->hostctl);
/* We do not handle DMA boundaries, so set it to max (512 KiB) */
- writew((7 << 12) | (512 << 0), &host->reg->blksize);
+ writew((7 << 12) | (data->blocksize & 0xFFF), &host->reg->blksize);
writew(data->blocks, &host->reg->blkcnt);
}