aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/mmc
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/mmc')
-rw-r--r--include/linux/mmc/card.h10
-rw-r--r--include/linux/mmc/sdio_func.h2
2 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index 520d9d29b3b2..a444431e28bd 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -65,8 +65,16 @@ struct sdio_cccr {
65 high_speed:1; 65 high_speed:1;
66}; 66};
67 67
68struct sdio_cis {
69 unsigned short vendor;
70 unsigned short device;
71 unsigned short blksize;
72 unsigned int max_dtr;
73};
74
68struct mmc_host; 75struct mmc_host;
69struct sdio_func; 76struct sdio_func;
77struct sdio_func_tuple;
70 78
71#define SDIO_MAX_FUNCS 7 79#define SDIO_MAX_FUNCS 7
72 80
@@ -98,7 +106,9 @@ struct mmc_card {
98 106
99 unsigned int sdio_funcs; /* number of SDIO functions */ 107 unsigned int sdio_funcs; /* number of SDIO functions */
100 struct sdio_cccr cccr; /* common card info */ 108 struct sdio_cccr cccr; /* common card info */
109 struct sdio_cis cis; /* common tuple info */
101 struct sdio_func *sdio_func[SDIO_MAX_FUNCS]; /* SDIO functions (devices) */ 110 struct sdio_func *sdio_func[SDIO_MAX_FUNCS]; /* SDIO functions (devices) */
111 struct sdio_func_tuple *tuples; /* unknown common tuples */
102}; 112};
103 113
104#define mmc_card_mmc(c) ((c)->type == MMC_TYPE_MMC) 114#define mmc_card_mmc(c) ((c)->type == MMC_TYPE_MMC)
diff --git a/include/linux/mmc/sdio_func.h b/include/linux/mmc/sdio_func.h
index 269067663c8d..2f2b3c854415 100644
--- a/include/linux/mmc/sdio_func.h
+++ b/include/linux/mmc/sdio_func.h
@@ -36,6 +36,8 @@ struct sdio_func {
36 unsigned short vendor; /* vendor id */ 36 unsigned short vendor; /* vendor id */
37 unsigned short device; /* device id */ 37 unsigned short device; /* device id */
38 38
39 unsigned short blksize; /* maximum block size */
40
39 unsigned int state; /* function state */ 41 unsigned int state; /* function state */
40#define SDIO_STATE_PRESENT (1<<0) /* present in sysfs */ 42#define SDIO_STATE_PRESENT (1<<0) /* present in sysfs */
41 43