diff options
| author | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-22 13:15:27 +0200 |
|---|---|---|
| committer | Ulf HANSSON <ulf.hansson@stericsson.com> | 2011-09-23 15:13:25 +0200 |
| commit | 7fbb06612c0f054ae4689deeab8d2b37d3144f94 (patch) | |
| tree | 28b759b8b1962bb67214d28fcbe1ddc30e206d7e /include | |
| parent | be4416a9e71b65ebd1d56e8c4fc64a0a55eb522a (diff) | |
mmc: mmci: Change vdd_handler to a generic ios handler
The purpose of the vdd_handler does not make sense. We remove it
and use a more generic approach instead. A new "ios" handler is thus
added, the purpose of which e.g. can be to control GPIO pins to
a levelshifter.
Previously the vdd_handler was also used for making additional
changes to the MMCIPOWER register bits. This option is now removed.
This patch is based upon a patch from Sebastian Rasmussen.
Change-Id: I250c7d243946acd9cc9da2d4d18394db1256cd27
Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com>
Signed-off-by: Sebastian Rasmussen <sebastian.rasmussen@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/31883
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/amba/mmci.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/amba/mmci.h b/include/linux/amba/mmci.h index 56c659fb01c..d14b2e6db2b 100644 --- a/include/linux/amba/mmci.h +++ b/include/linux/amba/mmci.h @@ -41,7 +41,8 @@ struct dma_chan; * @ocr_mask: available voltages on the 4 pins from the block, this * is ignored if a regulator is used, see the MMC_VDD_* masks in * mmc/host.h - * @vdd_handler: a callback function to translate a MMC_VDD_* + * @ios_handler: a callback function to act on specfic ios changes, + * used for example to control a levelshifter * mask into a value to be binary (or set some other custom bits * in MMCIPWR) or:ed and written into the MMCIPWR register of the * block. May also control external power based on the power_mode. @@ -70,8 +71,7 @@ struct dma_chan; struct mmci_platform_data { unsigned int f_max; unsigned int ocr_mask; - u32 (*vdd_handler)(struct device *, unsigned int vdd, - unsigned char power_mode); + int (*ios_handler)(struct device *, struct mmc_ios *); unsigned int (*status)(struct device *); int gpio_wp; int gpio_cd; |