diff options
author | Rabin Vincent <rabin.vincent@stericsson.com> | 2010-07-21 07:53:57 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-29 10:39:05 -0400 |
commit | bb8f563c848faa113059973f68c24a3bb6a9585e (patch) | |
tree | 7ce9952411dd8ba1e9f438a62d586d9078f06212 /include/linux/amba | |
parent | f5e2574e734650bbeb801a31cc99e628f9a027af (diff) |
ARM: 6243/1: mmci: pass power_mode to the translate_vdd callback
Platforms may have some external power control which need to be
controlled from board specific code. Rename the translate_vdd()
callback to vdd_handler() and pass it the power mode.
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/linux/amba')
-rw-r--r-- | include/linux/amba/mmci.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/linux/amba/mmci.h b/include/linux/amba/mmci.h index 7e466fe72025..ca84ce70d5d5 100644 --- a/include/linux/amba/mmci.h +++ b/include/linux/amba/mmci.h | |||
@@ -15,9 +15,10 @@ | |||
15 | * @ocr_mask: available voltages on the 4 pins from the block, this | 15 | * @ocr_mask: available voltages on the 4 pins from the block, this |
16 | * is ignored if a regulator is used, see the MMC_VDD_* masks in | 16 | * is ignored if a regulator is used, see the MMC_VDD_* masks in |
17 | * mmc/host.h | 17 | * mmc/host.h |
18 | * @translate_vdd: a callback function to translate a MMC_VDD_* | 18 | * @vdd_handler: a callback function to translate a MMC_VDD_* |
19 | * mask into a value to be binary or:ed and written into the | 19 | * mask into a value to be binary (or set some other custom bits |
20 | * MMCIPWR register of the block | 20 | * in MMCIPWR) or:ed and written into the MMCIPWR register of the |
21 | * block. May also control external power based on the power_mode. | ||
21 | * @status: if no GPIO read function was given to the block in | 22 | * @status: if no GPIO read function was given to the block in |
22 | * gpio_wp (below) this function will be called to determine | 23 | * gpio_wp (below) this function will be called to determine |
23 | * whether a card is present in the MMC slot or not | 24 | * whether a card is present in the MMC slot or not |
@@ -29,7 +30,8 @@ | |||
29 | struct mmci_platform_data { | 30 | struct mmci_platform_data { |
30 | unsigned int f_max; | 31 | unsigned int f_max; |
31 | unsigned int ocr_mask; | 32 | unsigned int ocr_mask; |
32 | u32 (*translate_vdd)(struct device *, unsigned int); | 33 | u32 (*vdd_handler)(struct device *, unsigned int vdd, |
34 | unsigned char power_mode); | ||
33 | unsigned int (*status)(struct device *); | 35 | unsigned int (*status)(struct device *); |
34 | int gpio_wp; | 36 | int gpio_wp; |
35 | int gpio_cd; | 37 | int gpio_cd; |