diff options
| author | Terry Lv <r65388@freescale.com> | 2009-11-10 22:29:11 +0800 |
|---|---|---|
| committer | Terry Lv <r65388@freescale.com> | 2009-11-11 11:55:18 +0800 |
| commit | 20710100e480543d36b76845c52cdec382f2b43a (patch) | |
| tree | 240703f02b2f29379dfae9ca97df234e5d1057ce /drivers/mmc | |
| parent | 34bc4951031059ccac23bf13fe261804f075880a (diff) | |
| download | u-boot-imx-20710100e480543d36b76845c52cdec382f2b43a.zip u-boot-imx-20710100e480543d36b76845c52cdec382f2b43a.tar.gz u-boot-imx-20710100e480543d36b76845c52cdec382f2b43a.tar.bz2 | |
ENGR00118294: Misc changes for v2009.08 upgrade.
Misc changes for v2009.08 upgrade.
Signed-off-by: Terry Lv <r65388@freescale.com>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/imx_esdhc.c | 12 | ||||
| -rw-r--r-- | drivers/mmc/mmc.c | 19 |
2 files changed, 25 insertions, 6 deletions
diff --git a/drivers/mmc/imx_esdhc.c b/drivers/mmc/imx_esdhc.c index 776bb1f..6181fca 100644 --- a/drivers/mmc/imx_esdhc.c +++ b/drivers/mmc/imx_esdhc.c @@ -1,4 +1,7 @@ /* + * (C) Copyright 2008-2009 Freescale Semiconductor, Inc. + * Terry Lv + * * Copyright 2007, Freescale Semiconductor, Inc * Andy Fleming * @@ -28,13 +31,10 @@ #include <config.h> #include <common.h> #include <command.h> -#include <hwconfig.h> #include <mmc.h> -#include <part.h> #include <malloc.h> #include <mmc.h> #include <fsl_esdhc.h> -#include <fdt_support.h> #include <asm/io.h> @@ -367,10 +367,10 @@ static int esdhc_init(struct mmc *mmc) set_sysctl(mmc, 400000); /* Put the PROCTL reg back to the default */ - writel(PROCTL_INIT | PROCTL_D3CD, ®s->proctl); + writel(PROCTL_INIT, ®s->proctl); /* FIXME: For our CINS bit doesn't work. So this section is disabled. */ - + /* while (!(readl(®s->prsstat) & PRSSTAT_CINS) && --timeout) mdelay(1); @@ -378,7 +378,7 @@ static int esdhc_init(struct mmc *mmc) printf("No MMC card detected!\n"); return NO_CARD_ERR; } - + */ set_sysctl(mmc, 400000); diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index dcc9548..f8510b2 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1,4 +1,7 @@ /* + * (C) Copyright 2008-2009 Freescale Semiconductor, Inc. + * Terry Lv + * * Copyright 2008, Freescale Semiconductor, Inc * Andy Fleming * @@ -864,6 +867,22 @@ int mmc_register(struct mmc *mmc) mmc->block_dev.removable = 1; mmc->block_dev.block_read = mmc_bread; mmc->block_dev.block_write = mmc_bwrite; +#if defined(CONFIG_DOS_PARTITION) + mmc->block_dev.part_type = PART_TYPE_DOS; + mmc->block_dev.type = DEV_TYPE_HARDDISK; +#elif defined(CONFIG_MAC_PARTITION) + mmc->block_dev.part_type = PART_TYPE_MAC; + mmc->block_dev.type = DEV_TYPE_HARDDISK; +#elif defined(CONFIG_ISO_PARTITION) + mmc->block_dev.part_type = PART_TYPE_ISO; + mmc->block_dev.type = DEV_TYPE_HARDDISK; +#elif defined(CONFIG_AMIGA_PARTITION) + mmc->block_dev.part_type = PART_TYPE_AMIGA; + mmc->block_dev.type = DEV_TYPE_HARDDISK; +#elif defined(CONFIG_EFI_PARTITION) + mmc->block_dev.part_type = PART_TYPE_EFI; + mmc->block_dev.type = DEV_TYPE_HARDDISK; +#endif INIT_LIST_HEAD (&mmc->link); |