diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-13 19:47:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-13 19:47:31 -0400 |
| commit | 51414d41084496aaefd06d7f19eb8206e8bfac2d (patch) | |
| tree | 31c7624d28a564e1cc918a30b8570a3c001a9c7c /include/linux | |
| parent | 201f92e2ca789d529418da8fa027d5457f0df024 (diff) | |
| parent | f39b2dd9d065151a04f5996656d1f27a7eb32d45 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
mmc: core: Bus width testing needs to handle suspend/resume
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mmc/card.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h index c6927a4d157f..6ad43554ac05 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h | |||
| @@ -64,6 +64,19 @@ struct mmc_ext_csd { | |||
| 64 | unsigned long long enhanced_area_offset; /* Units: Byte */ | 64 | unsigned long long enhanced_area_offset; /* Units: Byte */ |
| 65 | unsigned int enhanced_area_size; /* Units: KB */ | 65 | unsigned int enhanced_area_size; /* Units: KB */ |
| 66 | unsigned int boot_size; /* in bytes */ | 66 | unsigned int boot_size; /* in bytes */ |
| 67 | u8 raw_partition_support; /* 160 */ | ||
| 68 | u8 raw_erased_mem_count; /* 181 */ | ||
| 69 | u8 raw_ext_csd_structure; /* 194 */ | ||
| 70 | u8 raw_card_type; /* 196 */ | ||
| 71 | u8 raw_s_a_timeout; /* 217 */ | ||
| 72 | u8 raw_hc_erase_gap_size; /* 221 */ | ||
| 73 | u8 raw_erase_timeout_mult; /* 223 */ | ||
| 74 | u8 raw_hc_erase_grp_size; /* 224 */ | ||
| 75 | u8 raw_sec_trim_mult; /* 229 */ | ||
| 76 | u8 raw_sec_erase_mult; /* 230 */ | ||
| 77 | u8 raw_sec_feature_support;/* 231 */ | ||
| 78 | u8 raw_trim_mult; /* 232 */ | ||
| 79 | u8 raw_sectors[4]; /* 212 - 4 bytes */ | ||
| 67 | }; | 80 | }; |
| 68 | 81 | ||
| 69 | struct sd_scr { | 82 | struct sd_scr { |