minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 12:39:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

mmc: change magic number to macro define

Browse Source 
Previous magic number is hard to parse its meaning, change it to
respective macro definition

Signed-off-by: Lei Wen <leiwen@marvell.com>
Acked-by: WOlfgang Denk <wd@denx.de>
This commit is contained in:
Lei Wen 2011-10-03 20:35:10 +00:00 committed by Andy Fleming
parent 02d3ad3e19
commit 0560db18ec
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/mmc/mmc.c
View File

@ -638,7 +638,7 @@ int mmc_change_freq(struct mmc *mmc)
if (err) if (err)
return err; return err;
cardtype = ext_csd[196] & 0xf; cardtype = ext_csd[EXT_CSD_CARD_TYPE] & 0xf;
err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_HS_TIMING, 1); err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_HS_TIMING, 1);
@ -652,7 +652,7 @@ int mmc_change_freq(struct mmc *mmc)
return err; return err;
/* No high-speed support */ /* No high-speed support */
if (!ext_csd[185]) if (!ext_csd[EXT_CSD_HS_TIMING])
return 0; return 0;
/* High Speed is set, there are two types: 52MHz and 26MHz */ /* High Speed is set, there are two types: 52MHz and 26MHz */
@ -1006,14 +1006,16 @@ int mmc_startup(struct mmc *mmc)
if (!IS_SD(mmc) && (mmc->version >= MMC_VERSION_4)) { if (!IS_SD(mmc) && (mmc->version >= MMC_VERSION_4)) {
/* check ext_csd version and capacity */ /* check ext_csd version and capacity */
err = mmc_send_ext_csd(mmc, ext_csd); err = mmc_send_ext_csd(mmc, ext_csd);
if (!err & (ext_csd[192] >= 2)) { if (!err & (ext_csd[EXT_CSD_REV] >= 2)) {
/* /*
* According to the JEDEC Standard, the value of * According to the JEDEC Standard, the value of
* ext_csd's capacity is valid if the value is more * ext_csd's capacity is valid if the value is more
* than 2GB * than 2GB
*/ */
capacity = ext_csd[212] << 0 | ext_csd[213] << 8 | capacity = ext_csd[EXT_CSD_SEC_CNT] << 0
ext_csd[214] << 16 | ext_csd[215] << 24; | ext_csd[EXT_CSD_SEC_CNT + 1] << 8
| ext_csd[EXT_CSD_SEC_CNT + 2] << 16
| ext_csd[EXT_CSD_SEC_CNT + 3] << 24;
capacity *= 512; capacity *= 512;
if ((capacity >> 20) > 2 * 1024) if ((capacity >> 20) > 2 * 1024)
mmc->capacity = capacity; mmc->capacity = capacity;
@ -1024,8 +1026,9 @@ int mmc_startup(struct mmc *mmc)
* group size from ext_csd directly, or calculate * group size from ext_csd directly, or calculate
* the group size from the csd value. * the group size from the csd value.
*/ */
if (ext_csd[175]) if (ext_csd[EXT_CSD_ERASE_GROUP_DEF])
mmc->erase_grp_size = ext_csd[224] * 512 * 1024; mmc->erase_grp_size =
ext_csd[EXT_CSD_HC_ERASE_GRP_SIZE] * 512 * 1024;
else { else {
int erase_gsz, erase_gmul; int erase_gsz, erase_gmul;
erase_gsz = (mmc->csd[2] & 0x00007c00) >> 10; erase_gsz = (mmc->csd[2] & 0x00007c00) >> 10;
@ -1035,8 +1038,8 @@ int mmc_startup(struct mmc *mmc)
} }
/* store the partition info of emmc */ /* store the partition info of emmc */
if (ext_csd[160] & PART_SUPPORT) if (ext_csd[EXT_CSD_PARTITIONING_SUPPORT] & PART_SUPPORT)
mmc->part_config = ext_csd[179]; mmc->part_config = ext_csd[EXT_CSD_PART_CONF];
} }
if (IS_SD(mmc)) if (IS_SD(mmc))

6
include/mmc.h
View File

@ -145,13 +145,15 @@
/* /*
* EXT_CSD fields * EXT_CSD fields
*/ */
#define EXT_CSD_PARTITIONING_SUPPORT 160 /* RO */
#define EXT_CSD_ERASE_GROUP_DEF 175 /* R/W */
#define EXT_CSD_PART_CONF 179 /* R/W */ #define EXT_CSD_PART_CONF 179 /* R/W */
#define EXT_CSD_BUS_WIDTH 183 /* R/W */ #define EXT_CSD_BUS_WIDTH 183 /* R/W */
#define EXT_CSD_HS_TIMING 185 /* R/W */ #define EXT_CSD_HS_TIMING 185 /* R/W */
#define EXT_CSD_CARD_TYPE 196 /* RO */
#define EXT_CSD_REV 192 /* RO */ #define EXT_CSD_REV 192 /* RO */
#define EXT_CSD_CARD_TYPE 196 /* RO */
#define EXT_CSD_SEC_CNT 212 /* RO, 4 bytes */ #define EXT_CSD_SEC_CNT 212 /* RO, 4 bytes */
#define EXT_CSD_HC_ERASE_GRP_SIZE 224 /* RO */
/* /*
* EXT_CSD field definitions * EXT_CSD field definitions