aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/mmc
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/mmc')
-rw-r--r--include/linux/mmc/card.h3
-rw-r--r--include/linux/mmc/host.h4
-rw-r--r--include/linux/mmc/mmc.h2
3 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index aefedf04b9bb..538e8c86336c 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -47,6 +47,7 @@ struct mmc_card {
47#define MMC_STATE_PRESENT (1<<0) /* present in sysfs */ 47#define MMC_STATE_PRESENT (1<<0) /* present in sysfs */
48#define MMC_STATE_DEAD (1<<1) /* device no longer in stack */ 48#define MMC_STATE_DEAD (1<<1) /* device no longer in stack */
49#define MMC_STATE_BAD (1<<2) /* unrecognised device */ 49#define MMC_STATE_BAD (1<<2) /* unrecognised device */
50#define MMC_STATE_SDCARD (1<<3) /* is an SD card */
50 u32 raw_cid[4]; /* raw card CID */ 51 u32 raw_cid[4]; /* raw card CID */
51 u32 raw_csd[4]; /* raw card CSD */ 52 u32 raw_csd[4]; /* raw card CSD */
52 struct mmc_cid cid; /* card identification */ 53 struct mmc_cid cid; /* card identification */
@@ -56,10 +57,12 @@ struct mmc_card {
56#define mmc_card_present(c) ((c)->state & MMC_STATE_PRESENT) 57#define mmc_card_present(c) ((c)->state & MMC_STATE_PRESENT)
57#define mmc_card_dead(c) ((c)->state & MMC_STATE_DEAD) 58#define mmc_card_dead(c) ((c)->state & MMC_STATE_DEAD)
58#define mmc_card_bad(c) ((c)->state & MMC_STATE_BAD) 59#define mmc_card_bad(c) ((c)->state & MMC_STATE_BAD)
60#define mmc_card_sd(c) ((c)->state & MMC_STATE_SDCARD)
59 61
60#define mmc_card_set_present(c) ((c)->state |= MMC_STATE_PRESENT) 62#define mmc_card_set_present(c) ((c)->state |= MMC_STATE_PRESENT)
61#define mmc_card_set_dead(c) ((c)->state |= MMC_STATE_DEAD) 63#define mmc_card_set_dead(c) ((c)->state |= MMC_STATE_DEAD)
62#define mmc_card_set_bad(c) ((c)->state |= MMC_STATE_BAD) 64#define mmc_card_set_bad(c) ((c)->state |= MMC_STATE_BAD)
65#define mmc_card_set_sd(c) ((c)->state |= MMC_STATE_SDCARD)
63 66
64#define mmc_card_name(c) ((c)->cid.prod_name) 67#define mmc_card_name(c) ((c)->cid.prod_name)
65#define mmc_card_id(c) ((c)->dev.bus_id) 68#define mmc_card_id(c) ((c)->dev.bus_id)
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 30f68c0c8c6e..845020d90c60 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -87,6 +87,10 @@ struct mmc_host {
87 struct mmc_ios ios; /* current io bus settings */ 87 struct mmc_ios ios; /* current io bus settings */
88 u32 ocr; /* the current OCR setting */ 88 u32 ocr; /* the current OCR setting */
89 89
90 unsigned int mode; /* current card mode of host */
91#define MMC_MODE_MMC 0
92#define MMC_MODE_SD 1
93
90 struct list_head cards; /* devices attached to this host */ 94 struct list_head cards; /* devices attached to this host */
91 95
92 wait_queue_head_t wq; 96 wait_queue_head_t wq;
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h
index 0d35d4ffb360..1ab78e8d6c53 100644
--- a/include/linux/mmc/mmc.h
+++ b/include/linux/mmc/mmc.h
@@ -88,6 +88,8 @@ struct mmc_card;
88 88
89extern int mmc_wait_for_req(struct mmc_host *, struct mmc_request *); 89extern int mmc_wait_for_req(struct mmc_host *, struct mmc_request *);
90extern int mmc_wait_for_cmd(struct mmc_host *, struct mmc_command *, int); 90extern int mmc_wait_for_cmd(struct mmc_host *, struct mmc_command *, int);
91extern int mmc_wait_for_app_cmd(struct mmc_host *, unsigned int,
92 struct mmc_command *, int);
91 93
92extern int __mmc_claim_host(struct mmc_host *host, struct mmc_card *card); 94extern int __mmc_claim_host(struct mmc_host *host, struct mmc_card *card);
93 95