diff options
author | Roger Tseng <rogerable@realtek.com> | 2013-02-04 02:45:58 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-02-13 18:22:59 -0500 |
commit | 88a7ee37f3c5c73b000f7ba2000b27c5002a5286 (patch) | |
tree | cf73579f1eb6597ca8df1edc93597a7b0023869e /drivers/mfd/rtl8411.c | |
parent | 8ea402f5646e6e36c8cd0a62053ba8939204dceb (diff) |
mfd: rtsx: Implement driving adjustment to device-dependent callbacks
Implement different ways of selecting driving capability(a necessary adjustment
along with voltage change). It was origionally in device-independent
mmc/host/rtsx_pci_sdmmc.c. Moving it here to support devices which may have a
different way of adjustment.
Signed-off-by: Roger Tseng <rogerable@realtek.com>
Reviewed-by: Wei WANG <wei_wang@realsil.com.cn>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/rtl8411.c')
-rw-r--r-- | drivers/mfd/rtl8411.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/drivers/mfd/rtl8411.c b/drivers/mfd/rtl8411.c index 3d3b4addf81a..2a2d31687b72 100644 --- a/drivers/mfd/rtl8411.c +++ b/drivers/mfd/rtl8411.c | |||
@@ -115,14 +115,24 @@ static int rtl8411_card_power_off(struct rtsx_pcr *pcr, int card) | |||
115 | static int rtl8411_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage) | 115 | static int rtl8411_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage) |
116 | { | 116 | { |
117 | u8 mask, val; | 117 | u8 mask, val; |
118 | int err; | ||
118 | 119 | ||
119 | mask = (BPP_REG_TUNED18 << BPP_TUNED18_SHIFT_8411) | BPP_PAD_MASK; | 120 | mask = (BPP_REG_TUNED18 << BPP_TUNED18_SHIFT_8411) | BPP_PAD_MASK; |
120 | if (voltage == OUTPUT_3V3) | 121 | if (voltage == OUTPUT_3V3) { |
122 | err = rtsx_pci_write_register(pcr, | ||
123 | SD30_DRIVE_SEL, 0x07, DRIVER_TYPE_D); | ||
124 | if (err < 0) | ||
125 | return err; | ||
121 | val = (BPP_ASIC_3V3 << BPP_TUNED18_SHIFT_8411) | BPP_PAD_3V3; | 126 | val = (BPP_ASIC_3V3 << BPP_TUNED18_SHIFT_8411) | BPP_PAD_3V3; |
122 | else if (voltage == OUTPUT_1V8) | 127 | } else if (voltage == OUTPUT_1V8) { |
128 | err = rtsx_pci_write_register(pcr, | ||
129 | SD30_DRIVE_SEL, 0x07, DRIVER_TYPE_B); | ||
130 | if (err < 0) | ||
131 | return err; | ||
123 | val = (BPP_ASIC_1V8 << BPP_TUNED18_SHIFT_8411) | BPP_PAD_1V8; | 132 | val = (BPP_ASIC_1V8 << BPP_TUNED18_SHIFT_8411) | BPP_PAD_1V8; |
124 | else | 133 | } else { |
125 | return -EINVAL; | 134 | return -EINVAL; |
135 | } | ||
126 | 136 | ||
127 | return rtsx_pci_write_register(pcr, LDO_CTL, mask, val); | 137 | return rtsx_pci_write_register(pcr, LDO_CTL, mask, val); |
128 | } | 138 | } |