Merge remote-tracking branch 'torvalds/master' into perf/core

[linux-2.6-microblaze.git] / drivers / misc / cardreader / rts5260.c

diff --git a/drivers/misc/cardreader/rts5260.c b/drivers/misc/cardreader/rts5260.c
index b9f66b1..9b42b20 100644 (file)
--- a/drivers/misc/cardreader/rts5260.c
+++ b/drivers/misc/cardreader/rts5260.c
@@ -26,21 +26,17 @@ static u8 rts5260_get_ic_version(struct rtsx_pcr *pcr)
 
 static void rts5260_fill_driving(struct rtsx_pcr *pcr, u8 voltage)
 {
-       u8 driving_3v3[6][3] = {
-               {0x94, 0x94, 0x94},
-               {0x11, 0x11, 0x18},
-               {0x55, 0x55, 0x5C},
-               {0x94, 0x94, 0x94},
-               {0x94, 0x94, 0x94},
-               {0xFF, 0xFF, 0xFF},
+       u8 driving_3v3[4][3] = {
+               {0x11, 0x11, 0x11},
+               {0x22, 0x22, 0x22},
+               {0x55, 0x55, 0x55},
+               {0x33, 0x33, 0x33},
        };
-       u8 driving_1v8[6][3] = {
-               {0x9A, 0x89, 0x89},
-               {0xC4, 0xC4, 0xC4},
-               {0x3C, 0x3C, 0x3C},
+       u8 driving_1v8[4][3] = {
+               {0x35, 0x33, 0x33},
+               {0x8A, 0x88, 0x88},
+               {0xBD, 0xBB, 0xBB},
                {0x9B, 0x99, 0x99},
-               {0x9A, 0x89, 0x89},
-               {0xFE, 0xFE, 0xFE},
        };
        u8 (*driving)[3], drive_sel;
 
@@ -58,7 +54,7 @@ static void rts5260_fill_driving(struct rtsx_pcr *pcr, u8 voltage)
        rtsx_pci_write_register(pcr, SD30_CMD_DRIVE_SEL,
                         0xFF, driving[drive_sel][1]);
 
-       rtsx_pci_write_register(pcr, SD30_CMD_DRIVE_SEL,
+       rtsx_pci_write_register(pcr, SD30_DAT_DRIVE_SEL,
                         0xFF, driving[drive_sel][2]);
 }
 
@@ -82,26 +78,13 @@ static void rtsx_base_fetch_vendor_settings(struct rtsx_pcr *pcr)
 
        pci_read_config_dword(pdev, PCR_SETTING_REG2, &reg);
        pcr_dbg(pcr, "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG2, reg);
+       if (rtsx_check_mmc_support(reg))
+               pcr->extra_caps |= EXTRA_CAPS_NO_MMC;
        pcr->sd30_drive_sel_3v3 = rtsx_reg_to_sd30_drive_sel_3v3(reg);
        if (rtsx_reg_check_reverse_socket(reg))
                pcr->flags |= PCR_REVERSE_SOCKET;
 }
 
-static void rtsx_base_force_power_down(struct rtsx_pcr *pcr, u8 pm_state)
-{
-       /* Set relink_time to 0 */
-       rtsx_pci_write_register(pcr, AUTOLOAD_CFG_BASE + 1, MASK_8_BIT_DEF, 0);
-       rtsx_pci_write_register(pcr, AUTOLOAD_CFG_BASE + 2, MASK_8_BIT_DEF, 0);
-       rtsx_pci_write_register(pcr, AUTOLOAD_CFG_BASE + 3,
-                               RELINK_TIME_MASK, 0);
-
-       if (pm_state == HOST_ENTER_S3)
-               rtsx_pci_write_register(pcr, pcr->reg_pm_ctrl3,
-                                       D3_DELINK_MODE_EN, D3_DELINK_MODE_EN);
-
-       rtsx_pci_write_register(pcr, FPDCTL, ALL_POWER_DOWN, ALL_POWER_DOWN);
-}
-
 static int rtsx_base_enable_auto_blink(struct rtsx_pcr *pcr)
 {
        return rtsx_pci_write_register(pcr, OLT_LED_CTL,
@@ -574,6 +557,8 @@ static int rts5260_extra_init_hw(struct rtsx_pcr *pcr)
                rtsx_pci_write_register(pcr, PETXCFG,
                                 FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH);
 
+       rtsx_pci_write_register(pcr, pcr->reg_pm_ctrl3, 0x10, 0x00);
+
        return 0;
 }
 
@@ -620,7 +605,6 @@ static const struct pcr_ops rts5260_pcr_ops = {
        .card_power_on = rts5260_card_power_on,
        .card_power_off = rts5260_card_power_off,
        .switch_output_voltage = rts5260_switch_output_voltage,
-       .force_power_down = rtsx_base_force_power_down,
        .stop_cmd = rts5260_stop_cmd,
        .set_l1off_cfg_sub_d0 = rts5260_set_l1off_cfg_sub_d0,
        .enable_ocp = rts5260_enable_ocp,
@@ -644,6 +628,7 @@ void rts5260_init_params(struct rtsx_pcr *pcr)
        pcr->sd30_drive_sel_1v8 = CFG_DRIVER_TYPE_B;
        pcr->sd30_drive_sel_3v3 = CFG_DRIVER_TYPE_B;
        pcr->aspm_en = ASPM_L1_EN;
+       pcr->aspm_mode = ASPM_MODE_REG;
        pcr->tx_initial_phase = SET_CLOCK_PHASE(27, 29, 11);
        pcr->rx_initial_phase = SET_CLOCK_PHASE(24, 6, 5);