diff options
Diffstat (limited to 'drivers/mmc/host/mmci.h')
-rw-r--r-- | drivers/mmc/host/mmci.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h index c1df7b82d36c..ec9a7bc6d0df 100644 --- a/drivers/mmc/host/mmci.h +++ b/drivers/mmc/host/mmci.h | |||
@@ -148,8 +148,10 @@ | |||
148 | 148 | ||
149 | struct clk; | 149 | struct clk; |
150 | struct variant_data; | 150 | struct variant_data; |
151 | struct dma_chan; | ||
151 | 152 | ||
152 | struct mmci_host { | 153 | struct mmci_host { |
154 | phys_addr_t phybase; | ||
153 | void __iomem *base; | 155 | void __iomem *base; |
154 | struct mmc_request *mrq; | 156 | struct mmc_request *mrq; |
155 | struct mmc_command *cmd; | 157 | struct mmc_command *cmd; |
@@ -161,8 +163,6 @@ struct mmci_host { | |||
161 | int gpio_cd_irq; | 163 | int gpio_cd_irq; |
162 | bool singleirq; | 164 | bool singleirq; |
163 | 165 | ||
164 | unsigned int data_xfered; | ||
165 | |||
166 | spinlock_t lock; | 166 | spinlock_t lock; |
167 | 167 | ||
168 | unsigned int mclk; | 168 | unsigned int mclk; |
@@ -181,5 +181,16 @@ struct mmci_host { | |||
181 | struct sg_mapping_iter sg_miter; | 181 | struct sg_mapping_iter sg_miter; |
182 | unsigned int size; | 182 | unsigned int size; |
183 | struct regulator *vcc; | 183 | struct regulator *vcc; |
184 | |||
185 | #ifdef CONFIG_DMA_ENGINE | ||
186 | /* DMA stuff */ | ||
187 | struct dma_chan *dma_current; | ||
188 | struct dma_chan *dma_rx_channel; | ||
189 | struct dma_chan *dma_tx_channel; | ||
190 | |||
191 | #define dma_inprogress(host) ((host)->dma_current) | ||
192 | #else | ||
193 | #define dma_inprogress(host) (0) | ||
194 | #endif | ||
184 | }; | 195 | }; |
185 | 196 | ||