Skip to content

Commit

Permalink
staging: rts_pstor: MSXC card power class
Browse files Browse the repository at this point in the history
1, Initialize chip->ms_power_class_en in rtsx_init_options;
2, In reset_ms_pro, set different initial value of change_power_class
according to chip->ms_power_class_en.

Signed-off-by: wwang <wei_wang@realsil.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
wwang authored and Greg Kroah-Hartman committed Mar 10, 2011
1 parent 7c31607 commit 9fe341e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
14 changes: 9 additions & 5 deletions drivers/staging/rts_pstor/ms.c
Original file line number Diff line number Diff line change
Expand Up @@ -1099,7 +1099,14 @@ static int reset_ms_pro(struct rtsx_chip *chip)
struct ms_info *ms_card = &(chip->ms_card);
int retval;
#ifdef XC_POWERCLASS
u8 change_power_class = 2;
u8 change_power_class;

if (chip->ms_power_class_en & 0x02)
change_power_class = 2;
else if (chip->ms_power_class_en & 0x01)
change_power_class = 1;
else
change_power_class = 0;
#endif

#ifdef XC_POWERCLASS
Expand Down Expand Up @@ -1128,10 +1135,7 @@ static int reset_ms_pro(struct rtsx_chip *chip)
}

if (change_power_class && CHK_MSXC(ms_card)) {
u8 power_class_en = 0x03;

if (CHECK_PID(chip, 0x5209))
power_class_en = chip->ms_power_class_en;
u8 power_class_en = chip->ms_power_class_en;

RTSX_DEBUGP("power_class_en = 0x%x\n", power_class_en);
RTSX_DEBUGP("change_power_class = %d\n", change_power_class);
Expand Down
1 change: 1 addition & 0 deletions drivers/staging/rts_pstor/rtsx.c
Original file line number Diff line number Diff line change
Expand Up @@ -850,6 +850,7 @@ static void rtsx_init_options(struct rtsx_chip *chip)
chip->sd_default_rx_phase = 15;
chip->pmos_pwr_on_interval = 200;
chip->sd_voltage_switch_delay = 1000;
chip->ms_power_class_en = 3;

chip->sd_400mA_ocp_thd = 1;
chip->sd_800mA_ocp_thd = 5;
Expand Down

0 comments on commit 9fe341e

Please sign in to comment.