diff options
| author | Jason Liu <jason.hui@linaro.org> | 2011-12-14 19:42:03 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2012-01-09 21:10:10 +0800 |
| commit | d658b0ce7b9e0429f68ce892267d81f6bbb124a8 (patch) | |
| tree | 337c196ae5cb301f8d164669379583c5f044af96 /include | |
| parent | 50700a7e6a5d43a720362cd4f95305748417d831 (diff) | |
Revert "ENGR00126228 eMMC: Configure boot_partition_enable"
This reverts commit b35268ca923a8785ab311170b0a84210b3c7863e.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mmc/card.h | 1 | ||||
| -rw-r--r-- | include/linux/mmc/mmc.h | 25 |
2 files changed, 2 insertions, 24 deletions
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h index b7702db5ba46..621df95b28fa 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h @@ -81,7 +81,6 @@ struct mmc_ext_csd { unsigned char boot_info; unsigned char boot_size_mult; unsigned char boot_config; - unsigned char boot_bus_width; }; struct sd_scr { diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h index 78a398d3a76c..fe1da341e28d 100644 --- a/include/linux/mmc/mmc.h +++ b/include/linux/mmc/mmc.h @@ -286,7 +286,7 @@ struct _mmc_csd { #define EXT_CSD_BOOT_CONFIG 179 /* R/W */ #define EXT_CSD_BOOT_SIZE_MULT 226 /* RO, 1 bytes */ #define EXT_CSD_BOOT_INFO 228 /* RO, 1 bytes */ -#define EXT_CSD_BOOT_BUS_WIDTH 177 + /* * EXT_CSD field definitions */ @@ -321,28 +321,7 @@ struct _mmc_csd { #define EXT_CSD_SEC_BD_BLK_EN BIT(2) #define EXT_CSD_SEC_GB_CL_EN BIT(4) -#define EXT_CSD_BOOT_BUS_WIDTH_MASK (0x1F) -#define EXT_CSD_BOOT_BUS_WIDTH_MODE_MASK (0x3 << 3) -#define EXT_CSD_BOOT_BUS_WIDTH_MODE_SDR_NORMAL (0x0) -#define EXT_CSD_BOOT_BUS_WIDTH_MODE_SDR_HIGH (0x1) -#define EXT_CSD_BOOT_BUS_WIDTH_MODE_DDR (0x2) -#define EXT_CSD_BOOT_BUS_WIDTH_RST_WIDTH (1 << 2) -#define EXT_CSD_BOOT_BUS_WIDTH_WIDTH_MASK (0x3) -#define EXT_CSD_BOOT_BUS_WIDTH_1_SDR_4_DDR (0x0) -#define EXT_CSD_BOOT_BUS_WIDTH_4_SDR_4_DDR (0x1) -#define EXT_CSD_BOOT_BUS_WIDTH_8_SDR_8_DDR (0x2) - -#define EXT_CSD_BOOT_ACK_ENABLE (0x1 << 6) -#define EXT_CSD_BOOT_PARTITION_ENABLE_MASK (0x7 << 3) -#define EXT_CSD_BOOT_PARTITION_DISABLE (0x0) -#define EXT_CSD_BOOT_PARTITION_PART1 (0x1 << 3) -#define EXT_CSD_BOOT_PARTITION_PART2 (0x2 << 3) -#define EXT_CSD_BOOT_PARTITION_USER (0x7 << 3) - -#define EXT_CSD_BOOT_PARTITION_ACCESS_MASK (0x7) -#define EXT_CSD_BOOT_PARTITION_ACCESS_DISABLE (0x0) -#define EXT_CSD_BOOT_PARTITION_ACCESS_PART1 (0x1) -#define EXT_CSD_BOOT_PARTITION_ACCESS_PART2 (0x2) +#define EXT_CSD_BOOT_PARTITION_ACCESS_MASK (0x3) /* * MMC_SWITCH access modes |