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>

3 files changed, 29 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)
 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);
 }
diff --git a/drivers/mfd/rts5209.c b/drivers/mfd/rts5209.c
index 98fe0f39463e..ec78d9fb0879 100644
--- a/drivers/mfd/rts5209.c
+++ b/drivers/mfd/rts5209.c
@@ -149,10 +149,18 @@ static int rts5209_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage)
         int err;
 
         if (voltage == OUTPUT_3V3) {
+                err = rtsx_pci_write_register(pcr,
+                                SD30_DRIVE_SEL, 0x07, DRIVER_TYPE_D);
+                if (err < 0)
+                        return err;
                 err = rtsx_pci_write_phy_register(pcr, 0x08, 0x4FC0 | 0x24);
                 if (err < 0)
                         return err;
         } else if (voltage == OUTPUT_1V8) {
+                err = rtsx_pci_write_register(pcr,
+                                SD30_DRIVE_SEL, 0x07, DRIVER_TYPE_B);
+                if (err < 0)
+                        return err;
                 err = rtsx_pci_write_phy_register(pcr, 0x08, 0x4C40 | 0x24);
                 if (err < 0)
                         return err;
diff --git a/drivers/mfd/rts5229.c b/drivers/mfd/rts5229.c
index 29d889cbb9c5..58af4dbe3586 100644
--- a/drivers/mfd/rts5229.c
+++ b/drivers/mfd/rts5229.c
@@ -119,10 +119,18 @@ static int rts5229_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage)
         int err;
 
         if (voltage == OUTPUT_3V3) {
+                err = rtsx_pci_write_register(pcr,
+                                SD30_DRIVE_SEL, 0x07, DRIVER_TYPE_D);
+                if (err < 0)
+                        return err;
                 err = rtsx_pci_write_phy_register(pcr, 0x08, 0x4FC0 | 0x24);
                 if (err < 0)
                         return err;
         } else if (voltage == OUTPUT_1V8) {
+                err = rtsx_pci_write_register(pcr,
+                                SD30_DRIVE_SEL, 0x07, DRIVER_TYPE_B);
+                if (err < 0)
+                        return err;
                 err = rtsx_pci_write_phy_register(pcr, 0x08, 0x4C40 | 0x24);
                 if (err < 0)
                         return err;