aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/amba/mmci.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/amba/mmci.h b/include/linux/amba/mmci.h
index b51bf5fa85f8..32a89cf5ec45 100644
--- a/include/linux/amba/mmci.h
+++ b/include/linux/amba/mmci.h
@@ -31,7 +31,8 @@ struct dma_chan;
31 * @ocr_mask: available voltages on the 4 pins from the block, this 31 * @ocr_mask: available voltages on the 4 pins from the block, this
32 * is ignored if a regulator is used, see the MMC_VDD_* masks in 32 * is ignored if a regulator is used, see the MMC_VDD_* masks in
33 * mmc/host.h 33 * mmc/host.h
34 * @vdd_handler: a callback function to translate a MMC_VDD_* 34 * @ios_handler: a callback function to act on specfic ios changes,
35 * used for example to control a levelshifter
35 * mask into a value to be binary (or set some other custom bits 36 * mask into a value to be binary (or set some other custom bits
36 * in MMCIPWR) or:ed and written into the MMCIPWR register of the 37 * in MMCIPWR) or:ed and written into the MMCIPWR register of the
37 * block. May also control external power based on the power_mode. 38 * block. May also control external power based on the power_mode.
@@ -61,8 +62,7 @@ struct dma_chan;
61struct mmci_platform_data { 62struct mmci_platform_data {
62 unsigned int f_max; 63 unsigned int f_max;
63 unsigned int ocr_mask; 64 unsigned int ocr_mask;
64 u32 (*vdd_handler)(struct device *, unsigned int vdd, 65 int (*ios_handler)(struct device *, struct mmc_ios *);
65 unsigned char power_mode);
66 unsigned int (*status)(struct device *); 66 unsigned int (*status)(struct device *);
67 int gpio_wp; 67 int gpio_wp;
68 int gpio_cd; 68 int gpio_cd;