summaryrefslogtreecommitdiff
path: root/drivers/mmc/davinci_mmc.c
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2011-04-18 05:50:08 +0000
committerAndy Fleming <afleming@freescale.com>2011-04-29 03:21:54 -0500
commit8feafcc49c0b7a9c541904f95a43dbef2fecc38b (patch)
tree0ba20c111634ddbb2513db50d3a3f05009f2cc08 /drivers/mmc/davinci_mmc.c
parent28df15e0234a773cfec98c2775915abe1472db3c (diff)
downloadu-boot-imx-8feafcc49c0b7a9c541904f95a43dbef2fecc38b.zip
u-boot-imx-8feafcc49c0b7a9c541904f95a43dbef2fecc38b.tar.gz
u-boot-imx-8feafcc49c0b7a9c541904f95a43dbef2fecc38b.tar.bz2
MMC: make b_max unconditional
Make existing field b_max field in struct mmc unconditional and use it instead of CONFIG_SYS_MMC_MAX_BLK_COUNT in mmc_bread and mmc_bwrite. Initialize b_max to CONFIG_SYS_MMC_MAX_BLK_COUNT in mmc_register if it has not been initialized by the hw driver. Initialize b_max to 0 in all callers to mmc_register. Signed-off-by: John Rigby <john.rigby@linaro.org> Signed-off-by: Andy Fleming <afleming@freescale.com>
Diffstat (limited to 'drivers/mmc/davinci_mmc.c')
-rw-r--r--drivers/mmc/davinci_mmc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c
index d5d19eb..5d918e6 100644
--- a/drivers/mmc/davinci_mmc.c
+++ b/drivers/mmc/davinci_mmc.c
@@ -394,9 +394,8 @@ int davinci_mmc_init(bd_t *bis, struct davinci_mmc *host)
mmc->voltages = host->voltages;
mmc->host_caps = host->host_caps;
-#ifdef CONFIG_MMC_MBLOCK
mmc->b_max = DAVINCI_MAX_BLOCKS;
-#endif
+
mmc_register(mmc);
return 0;