diff options
Diffstat (limited to 'include/linux/mfd/tmio.h')
| -rw-r--r-- | include/linux/mfd/tmio.h | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h index 57388171610d..605812820e48 100644 --- a/include/linux/mfd/tmio.h +++ b/include/linux/mfd/tmio.h | |||
| @@ -96,11 +96,6 @@ | |||
| 96 | #define TMIO_MMC_SDIO_STATUS_QUIRK (1 << 8) | 96 | #define TMIO_MMC_SDIO_STATUS_QUIRK (1 << 8) |
| 97 | 97 | ||
| 98 | /* | 98 | /* |
| 99 | * Some controllers have DMA enable/disable register | ||
| 100 | */ | ||
| 101 | #define TMIO_MMC_HAVE_CTL_DMA_REG (1 << 9) | ||
| 102 | |||
| 103 | /* | ||
| 104 | * Some controllers allows to set SDx actual clock | 99 | * Some controllers allows to set SDx actual clock |
| 105 | */ | 100 | */ |
| 106 | #define TMIO_MMC_CLK_ACTUAL (1 << 10) | 101 | #define TMIO_MMC_CLK_ACTUAL (1 << 10) |
| @@ -112,18 +107,6 @@ void tmio_core_mmc_clk_div(void __iomem *cnf, int shift, int state); | |||
| 112 | 107 | ||
| 113 | struct dma_chan; | 108 | struct dma_chan; |
| 114 | 109 | ||
| 115 | struct tmio_mmc_dma { | ||
| 116 | void *chan_priv_tx; | ||
| 117 | void *chan_priv_rx; | ||
| 118 | int slave_id_tx; | ||
| 119 | int slave_id_rx; | ||
| 120 | int alignment_shift; | ||
| 121 | dma_addr_t dma_rx_offset; | ||
| 122 | bool (*filter)(struct dma_chan *chan, void *arg); | ||
| 123 | }; | ||
| 124 | |||
| 125 | struct tmio_mmc_host; | ||
| 126 | |||
| 127 | /* | 110 | /* |
| 128 | * data for the MMC controller | 111 | * data for the MMC controller |
| 129 | */ | 112 | */ |
| @@ -132,19 +115,12 @@ struct tmio_mmc_data { | |||
| 132 | unsigned long capabilities; | 115 | unsigned long capabilities; |
| 133 | unsigned long capabilities2; | 116 | unsigned long capabilities2; |
| 134 | unsigned long flags; | 117 | unsigned long flags; |
| 135 | unsigned long bus_shift; | ||
| 136 | u32 ocr_mask; /* available voltages */ | 118 | u32 ocr_mask; /* available voltages */ |
| 137 | struct tmio_mmc_dma *dma; | ||
| 138 | struct device *dev; | ||
| 139 | unsigned int cd_gpio; | 119 | unsigned int cd_gpio; |
| 120 | int alignment_shift; | ||
| 121 | dma_addr_t dma_rx_offset; | ||
| 140 | void (*set_pwr)(struct platform_device *host, int state); | 122 | void (*set_pwr)(struct platform_device *host, int state); |
| 141 | void (*set_clk_div)(struct platform_device *host, int state); | 123 | void (*set_clk_div)(struct platform_device *host, int state); |
| 142 | int (*write16_hook)(struct tmio_mmc_host *host, int addr); | ||
| 143 | /* clock management callbacks */ | ||
| 144 | int (*clk_enable)(struct platform_device *pdev, unsigned int *f); | ||
| 145 | void (*clk_disable)(struct platform_device *pdev); | ||
| 146 | int (*multi_io_quirk)(struct mmc_card *card, | ||
| 147 | unsigned int direction, int blk_size); | ||
| 148 | }; | 124 | }; |
| 149 | 125 | ||
| 150 | /* | 126 | /* |
