diff options
| author | Christopher Kenna <cjk@cs.unc.edu> | 2012-09-28 13:46:28 -0400 |
|---|---|---|
| committer | Christopher Kenna <cjk@cs.unc.edu> | 2012-09-28 14:50:15 -0400 |
| commit | daa22703f14c007e93b464c45fa60019a36f546d (patch) | |
| tree | a1a130b6e128dc9d57c35c026977e1b4953105e1 /include/linux/amba | |
| parent | 5aa287dcf1b5879aa0150b0511833c52885f5b4c (diff) | |
Apply k4412 kernel from HardKernel for ODROID-X.
Diffstat (limited to 'include/linux/amba')
| -rw-r--r-- | include/linux/amba/mmci.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/amba/mmci.h b/include/linux/amba/mmci.h index 21114810c7c..60c737f7bda 100644 --- a/include/linux/amba/mmci.h +++ b/include/linux/amba/mmci.h | |||
| @@ -5,6 +5,15 @@ | |||
| 5 | #define AMBA_MMCI_H | 5 | #define AMBA_MMCI_H |
| 6 | 6 | ||
| 7 | #include <linux/mmc/host.h> | 7 | #include <linux/mmc/host.h> |
| 8 | #include <linux/mmc/card.h> | ||
| 9 | #include <linux/mmc/sdio_func.h> | ||
| 10 | |||
| 11 | struct embedded_sdio_data { | ||
| 12 | struct sdio_cis cis; | ||
| 13 | struct sdio_cccr cccr; | ||
| 14 | struct sdio_embedded_func *funcs; | ||
| 15 | int num_funcs; | ||
| 16 | }; | ||
| 8 | 17 | ||
| 9 | /* Just some dummy forwarding */ | 18 | /* Just some dummy forwarding */ |
| 10 | struct dma_chan; | 19 | struct dma_chan; |
| @@ -55,6 +64,9 @@ struct mmci_platform_data { | |||
| 55 | bool (*dma_filter)(struct dma_chan *chan, void *filter_param); | 64 | bool (*dma_filter)(struct dma_chan *chan, void *filter_param); |
| 56 | void *dma_rx_param; | 65 | void *dma_rx_param; |
| 57 | void *dma_tx_param; | 66 | void *dma_tx_param; |
| 67 | unsigned int status_irq; | ||
| 68 | struct embedded_sdio_data *embedded_sdio; | ||
| 69 | int (*register_status_notify)(void (*callback)(int card_present, void *dev_id), void *dev_id); | ||
| 58 | }; | 70 | }; |
| 59 | 71 | ||
| 60 | #endif | 72 | #endif |
