1 files changed, 46 insertions, 17 deletions

diff --git a/drivers/mfd/rts5209.c b/drivers/mfd/rts5209.c
index ec78d9fb0879..cb04174a8924 100644
--- a/drivers/mfd/rts5209.c
+++ b/drivers/mfd/rts5209.c
@@ -1,6 +1,6 @@
 /* Driver for Realtek PCI-Express card reader
  *
- * Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.
+ * Copyright(c) 2009-2013 Realtek Semiconductor Corp. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -17,7 +17,6 @@
  *
  * Author:
  *   Wei WANG <wei_wang@realsil.com.cn>
- *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
  */
 
 #include <linux/module.h>
@@ -34,19 +33,34 @@ static u8 rts5209_get_ic_version(struct rtsx_pcr *pcr)
         return val & 0x0F;
 }
 
-static void rts5209_init_vendor_cfg(struct rtsx_pcr *pcr)
+static void rts5209_fetch_vendor_settings(struct rtsx_pcr *pcr)
 {
-        u32 val;
+        u32 reg;
 
-        rtsx_pci_read_config_dword(pcr, 0x724, &val);
-        dev_dbg(&(pcr->pci->dev), "Cfg 0x724: 0x%x\n", val);
+        rtsx_pci_read_config_dword(pcr, PCR_SETTING_REG1, &reg);
+        dev_dbg(&(pcr->pci->dev), "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG1, reg);
 
-        if (!(val & 0x80)) {
-                if (val & 0x08)
-                        pcr->ms_pmos = false;
-                else
-                        pcr->ms_pmos = true;
+        if (rts5209_vendor_setting1_valid(reg)) {
+                if (rts5209_reg_check_ms_pmos(reg))
+                        pcr->flags |= PCR_MS_PMOS;
+                pcr->aspm_en = rts5209_reg_to_aspm(reg);
         }
+
+        rtsx_pci_read_config_dword(pcr, PCR_SETTING_REG2, &reg);
+        dev_dbg(&(pcr->pci->dev), "Cfg 0x%x: 0x%x\n", PCR_SETTING_REG2, reg);
+
+        if (rts5209_vendor_setting2_valid(reg)) {
+                pcr->sd30_drive_sel_1v8 =
+                        rts5209_reg_to_sd30_drive_sel_1v8(reg);
+                pcr->sd30_drive_sel_3v3 =
+                        rts5209_reg_to_sd30_drive_sel_3v3(reg);
+                pcr->card_drive_sel = rts5209_reg_to_card_drive_sel(reg);
+        }
+}
+
+static void rts5209_force_power_down(struct rtsx_pcr *pcr, u8 pm_state)
+{
+        rtsx_pci_write_register(pcr, FPDCTL, 0x07, 0x07);
 }
 
 static int rts5209_extra_init_hw(struct rtsx_pcr *pcr)
@@ -55,8 +69,15 @@ static int rts5209_extra_init_hw(struct rtsx_pcr *pcr)
 
         /* Turn off LED */
         rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, CARD_GPIO, 0xFF, 0x03);
+        /* Reset ASPM state to default value */
+        rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, ASPM_FORCE_CTL, 0x3F, 0);
+        /* Force CLKREQ# PIN to drive 0 to request clock */
+        rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PETXCFG, 0x08, 0x08);
         /* Configure GPIO as output */
         rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, CARD_GPIO_DIR, 0xFF, 0x03);
+        /* Configure driving */
+        rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, SD30_DRIVE_SEL,
+                        0xFF, pcr->sd30_drive_sel_3v3);
 
         return rtsx_pci_send_cmd(pcr, 100);
 }
@@ -95,7 +116,7 @@ static int rts5209_card_power_on(struct rtsx_pcr *pcr, int card)
         partial_pwr_on = SD_PARTIAL_POWER_ON;
         pwr_on = SD_POWER_ON;
 
-        if (pcr->ms_pmos && (card == RTSX_MS_CARD)) {
+        if ((pcr->flags & PCR_MS_PMOS) && (card == RTSX_MS_CARD)) {
                 pwr_mask = MS_POWER_MASK;
                 partial_pwr_on = MS_PARTIAL_POWER_ON;
                 pwr_on = MS_POWER_ON;
@@ -131,7 +152,7 @@ static int rts5209_card_power_off(struct rtsx_pcr *pcr, int card)
         pwr_mask = SD_POWER_MASK;
         pwr_off = SD_POWER_OFF;
 
-        if (pcr->ms_pmos && (card == RTSX_MS_CARD)) {
+        if ((pcr->flags & PCR_MS_PMOS) && (card == RTSX_MS_CARD)) {
                 pwr_mask = MS_POWER_MASK;
                 pwr_off = MS_POWER_OFF;
         }
@@ -140,7 +161,7 @@ static int rts5209_card_power_off(struct rtsx_pcr *pcr, int card)
         rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, CARD_PWR_CTL,
                         pwr_mask | PMOS_STRG_MASK, pwr_off | PMOS_STRG_400mA);
         rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PWR_GATE_CTRL,
-                        LDO3318_PWR_MASK, 0X06);
+                        LDO3318_PWR_MASK, 0x06);
         return rtsx_pci_send_cmd(pcr, 100);
 }
 
@@ -150,7 +171,7 @@ static int rts5209_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage)
 
         if (voltage == OUTPUT_3V3) {
                 err = rtsx_pci_write_register(pcr,
-                                SD30_DRIVE_SEL, 0x07, DRIVER_TYPE_D);
+                                SD30_DRIVE_SEL, 0x07, pcr->sd30_drive_sel_3v3);
                 if (err < 0)
                         return err;
                 err = rtsx_pci_write_phy_register(pcr, 0x08, 0x4FC0 | 0x24);
@@ -158,7 +179,7 @@ static int rts5209_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage)
                         return err;
         } else if (voltage == OUTPUT_1V8) {
                 err = rtsx_pci_write_register(pcr,
-                                SD30_DRIVE_SEL, 0x07, DRIVER_TYPE_B);
+                                SD30_DRIVE_SEL, 0x07, pcr->sd30_drive_sel_1v8);
                 if (err < 0)
                         return err;
                 err = rtsx_pci_write_phy_register(pcr, 0x08, 0x4C40 | 0x24);
@@ -172,6 +193,7 @@ static int rts5209_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage)
 }
 
 static const struct pcr_ops rts5209_pcr_ops = {
+        .fetch_vendor_settings = rts5209_fetch_vendor_settings,
         .extra_init_hw = rts5209_extra_init_hw,
         .optimize_phy = rts5209_optimize_phy,
         .turn_on_led = rts5209_turn_on_led,
@@ -183,6 +205,7 @@ static const struct pcr_ops rts5209_pcr_ops = {
         .switch_output_voltage = rts5209_switch_output_voltage,
         .cd_deglitch = NULL,
         .conv_clk_and_div_n = NULL,
+        .force_power_down = rts5209_force_power_down,
 };
 
 /* SD Pull Control Enable:
@@ -242,7 +265,13 @@ void rts5209_init_params(struct rtsx_pcr *pcr)
         pcr->num_slots = 2;
         pcr->ops = &rts5209_pcr_ops;
 
-        rts5209_init_vendor_cfg(pcr);
+        pcr->flags = 0;
+        pcr->card_drive_sel = RTS5209_CARD_DRIVE_DEFAULT;
+        pcr->sd30_drive_sel_1v8 = DRIVER_TYPE_B;
+        pcr->sd30_drive_sel_3v3 = DRIVER_TYPE_D;
+        pcr->aspm_en = ASPM_L1_EN;
+        pcr->tx_initial_phase = SET_CLOCK_PHASE(27, 27, 16);
+        pcr->rx_initial_phase = SET_CLOCK_PHASE(24, 6, 5);
 
         pcr->ic_version = rts5209_get_ic_version(pcr);
         pcr->sd_pull_ctl_enable_tbl = rts5209_sd_pull_ctl_enable_tbl;