Merge tag 'for-linus-20130509' of git://git.infradead.org/linux-mtd

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / rtl8411.c

diff --git a/drivers/mfd/rtl8411.c b/drivers/mfd/rtl8411.c
index 3d3b4addf81a9b73b480ae3874e2675e1678b52b..2a2d31687b72243de84451212ff52198f37ecc29 100644 (file)
--- 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)
 static int rtl8411_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage)
 {
        u8 mask, val;
+       int err;
 
        mask = (BPP_REG_TUNED18 << BPP_TUNED18_SHIFT_8411) | BPP_PAD_MASK;
-       if (voltage == OUTPUT_3V3)
+       if (voltage == OUTPUT_3V3) {
+               err = rtsx_pci_write_register(pcr,
+                               SD30_DRIVE_SEL, 0x07, DRIVER_TYPE_D);
+               if (err < 0)
+                       return err;
                val = (BPP_ASIC_3V3 << BPP_TUNED18_SHIFT_8411) | BPP_PAD_3V3;
-       else if (voltage == OUTPUT_1V8)
+       } else if (voltage == OUTPUT_1V8) {
+               err = rtsx_pci_write_register(pcr,
+                               SD30_DRIVE_SEL, 0x07, DRIVER_TYPE_B);
+               if (err < 0)
+                       return err;
                val = (BPP_ASIC_1V8 << BPP_TUNED18_SHIFT_8411) | BPP_PAD_1V8;
-       else
+       } else {
                return -EINVAL;
+       }
 
        return rtsx_pci_write_register(pcr, LDO_CTL, mask, val);
 }