|
@@ -2050,42 +2050,37 @@ static int sd_init_power(struct rtsx_chip *chip)
|
|
|
{
|
|
|
int retval;
|
|
|
|
|
|
- if (CHECK_PID(chip, 0x5209)) {
|
|
|
+ if (CHECK_PID(chip, 0x5209))
|
|
|
RTSX_WRITE_REG(chip, PWR_GATE_CTRL, LDO3318_PWR_MASK, LDO_OFF);
|
|
|
- }
|
|
|
|
|
|
retval = sd_power_off_card3v3(chip);
|
|
|
- if (retval != STATUS_SUCCESS) {
|
|
|
+ if (retval != STATUS_SUCCESS)
|
|
|
TRACE_RET(chip, STATUS_FAIL);
|
|
|
- }
|
|
|
|
|
|
- if (!chip->ft2_fast_mode) {
|
|
|
+ if (!chip->ft2_fast_mode)
|
|
|
wait_timeout(250);
|
|
|
- }
|
|
|
|
|
|
retval = enable_card_clock(chip, SD_CARD);
|
|
|
- if (retval != STATUS_SUCCESS) {
|
|
|
+ if (retval != STATUS_SUCCESS)
|
|
|
TRACE_RET(chip, STATUS_FAIL);
|
|
|
- }
|
|
|
|
|
|
if (chip->asic_code) {
|
|
|
retval = sd_pull_ctl_enable(chip);
|
|
|
- if (retval != STATUS_SUCCESS) {
|
|
|
+ if (retval != STATUS_SUCCESS)
|
|
|
TRACE_RET(chip, STATUS_FAIL);
|
|
|
- }
|
|
|
} else {
|
|
|
RTSX_WRITE_REG(chip, FPGA_PULL_CTL, FPGA_SD_PULL_CTL_BIT | 0x20, 0);
|
|
|
}
|
|
|
|
|
|
if (chip->ft2_fast_mode) {
|
|
|
- if (CHECK_PID(chip, 0x5209)) {
|
|
|
+ if (CHECK_PID(chip, 0x5209))
|
|
|
RTSX_WRITE_REG(chip, PWR_GATE_CTRL, LDO3318_PWR_MASK, LDO_ON);
|
|
|
- }
|
|
|
+
|
|
|
} else {
|
|
|
retval = card_power_on(chip, SD_CARD);
|
|
|
- if (retval != STATUS_SUCCESS) {
|
|
|
+ if (retval != STATUS_SUCCESS)
|
|
|
TRACE_RET(chip, STATUS_FAIL);
|
|
|
- }
|
|
|
+
|
|
|
wait_timeout(260);
|
|
|
|
|
|
#ifdef SUPPORT_OCP
|