diff options
Diffstat (limited to 'include/linux/mmc')
-rw-r--r-- | include/linux/mmc/host.h | 1 | ||||
-rw-r--r-- | include/linux/mmc/mmc.h | 1 | ||||
-rw-r--r-- | include/linux/mmc/sdhci.h | 4 |
3 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 52b5dc914a8c..ca7007fdb399 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h | |||
@@ -136,6 +136,7 @@ struct mmc_host_ops { | |||
136 | void (*init_card)(struct mmc_host *host, struct mmc_card *card); | 136 | void (*init_card)(struct mmc_host *host, struct mmc_card *card); |
137 | 137 | ||
138 | int (*start_signal_voltage_switch)(struct mmc_host *host, struct mmc_ios *ios); | 138 | int (*start_signal_voltage_switch)(struct mmc_host *host, struct mmc_ios *ios); |
139 | int (*execute_tuning)(struct mmc_host *host); | ||
139 | }; | 140 | }; |
140 | 141 | ||
141 | struct mmc_card; | 142 | struct mmc_card; |
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h index 373b2bf5e5b5..9fa5a73f393d 100644 --- a/include/linux/mmc/mmc.h +++ b/include/linux/mmc/mmc.h | |||
@@ -50,6 +50,7 @@ | |||
50 | #define MMC_SET_BLOCKLEN 16 /* ac [31:0] block len R1 */ | 50 | #define MMC_SET_BLOCKLEN 16 /* ac [31:0] block len R1 */ |
51 | #define MMC_READ_SINGLE_BLOCK 17 /* adtc [31:0] data addr R1 */ | 51 | #define MMC_READ_SINGLE_BLOCK 17 /* adtc [31:0] data addr R1 */ |
52 | #define MMC_READ_MULTIPLE_BLOCK 18 /* adtc [31:0] data addr R1 */ | 52 | #define MMC_READ_MULTIPLE_BLOCK 18 /* adtc [31:0] data addr R1 */ |
53 | #define MMC_SEND_TUNING_BLOCK 19 /* adtc R1 */ | ||
53 | 54 | ||
54 | /* class 3 */ | 55 | /* class 3 */ |
55 | #define MMC_WRITE_DAT_UNTIL_STOP 20 /* adtc [31:0] data addr R1 */ | 56 | #define MMC_WRITE_DAT_UNTIL_STOP 20 /* adtc [31:0] data addr R1 */ |
diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h index 92e1c9ad126c..b74c8530e959 100644 --- a/include/linux/mmc/sdhci.h +++ b/include/linux/mmc/sdhci.h | |||
@@ -111,6 +111,7 @@ struct sdhci_host { | |||
111 | #define SDHCI_USE_ADMA (1<<1) /* Host is ADMA capable */ | 111 | #define SDHCI_USE_ADMA (1<<1) /* Host is ADMA capable */ |
112 | #define SDHCI_REQ_USE_DMA (1<<2) /* Use DMA for this req. */ | 112 | #define SDHCI_REQ_USE_DMA (1<<2) /* Use DMA for this req. */ |
113 | #define SDHCI_DEVICE_DEAD (1<<3) /* Device unresponsive */ | 113 | #define SDHCI_DEVICE_DEAD (1<<3) /* Device unresponsive */ |
114 | #define SDHCI_SDR50_NEEDS_TUNING (1<<4) /* SDR50 needs tuning */ | ||
114 | 115 | ||
115 | unsigned int version; /* SDHCI spec. version */ | 116 | unsigned int version; /* SDHCI spec. version */ |
116 | 117 | ||
@@ -147,6 +148,9 @@ struct sdhci_host { | |||
147 | unsigned int ocr_avail_sd; | 148 | unsigned int ocr_avail_sd; |
148 | unsigned int ocr_avail_mmc; | 149 | unsigned int ocr_avail_mmc; |
149 | 150 | ||
151 | wait_queue_head_t buf_ready_int; /* Waitqueue for Buffer Read Ready interrupt */ | ||
152 | unsigned int tuning_done; /* Condition flag set when CMD19 succeeds */ | ||
153 | |||
150 | unsigned long private[0] ____cacheline_aligned; | 154 | unsigned long private[0] ____cacheline_aligned; |
151 | }; | 155 | }; |
152 | #endif /* __SDHCI_H */ | 156 | #endif /* __SDHCI_H */ |