diff options
author | Lee Jones <lee.jones@linaro.org> | 2012-11-14 07:35:51 -0500 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2012-12-06 13:54:44 -0500 |
commit | 5f1a4dd0372038f2490afa4540cd66b8d092839e (patch) | |
tree | b639556787904877e9c237d42fb69cc36350280f /include/linux/mmc/host.h | |
parent | d6ed91aff64891fb4f0e9557d9b1734a9e8410a7 (diff) |
mmc: Standardise capability type
There are discrepancies with regards to how MMC capabilities
are carried throughout the subsystem. Let's standardise them
to eliminate any confusion.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'include/linux/mmc/host.h')
-rw-r--r-- | include/linux/mmc/host.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 7abb0e1f7bda..37442b288ee8 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h | |||
@@ -211,7 +211,7 @@ struct mmc_host { | |||
211 | #define MMC_VDD_34_35 0x00400000 /* VDD voltage 3.4 ~ 3.5 */ | 211 | #define MMC_VDD_34_35 0x00400000 /* VDD voltage 3.4 ~ 3.5 */ |
212 | #define MMC_VDD_35_36 0x00800000 /* VDD voltage 3.5 ~ 3.6 */ | 212 | #define MMC_VDD_35_36 0x00800000 /* VDD voltage 3.5 ~ 3.6 */ |
213 | 213 | ||
214 | unsigned long caps; /* Host capabilities */ | 214 | u32 caps; /* Host capabilities */ |
215 | 215 | ||
216 | #define MMC_CAP_4_BIT_DATA (1 << 0) /* Can the host do 4 bit transfers */ | 216 | #define MMC_CAP_4_BIT_DATA (1 << 0) /* Can the host do 4 bit transfers */ |
217 | #define MMC_CAP_MMC_HIGHSPEED (1 << 1) /* Can do MMC high-speed timing */ | 217 | #define MMC_CAP_MMC_HIGHSPEED (1 << 1) /* Can do MMC high-speed timing */ |
@@ -241,7 +241,7 @@ struct mmc_host { | |||
241 | #define MMC_CAP_CMD23 (1 << 30) /* CMD23 supported. */ | 241 | #define MMC_CAP_CMD23 (1 << 30) /* CMD23 supported. */ |
242 | #define MMC_CAP_HW_RESET (1 << 31) /* Hardware reset */ | 242 | #define MMC_CAP_HW_RESET (1 << 31) /* Hardware reset */ |
243 | 243 | ||
244 | unsigned int caps2; /* More host capabilities */ | 244 | u32 caps2; /* More host capabilities */ |
245 | 245 | ||
246 | #define MMC_CAP2_BOOTPART_NOACC (1 << 0) /* Boot partition no access */ | 246 | #define MMC_CAP2_BOOTPART_NOACC (1 << 0) /* Boot partition no access */ |
247 | #define MMC_CAP2_CACHE_CTRL (1 << 1) /* Allow cache control */ | 247 | #define MMC_CAP2_CACHE_CTRL (1 << 1) /* Allow cache control */ |