Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325021
b: refs/heads/master
c: 5c39c05
h: refs/heads/master
i:
  325019: 258e5e5
v: v3
  • Loading branch information
Toshiaki Yamane authored and Greg Kroah-Hartman committed Sep 10, 2012
1 parent 0c4af9d commit e3eef0c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 15 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 282dadbc4994030b0bec7ea3d59345bde5ab2d82
refs/heads/master: 5c39c0584a6dd5f4449869fed308ee4e91aec719
24 changes: 10 additions & 14 deletions trunk/drivers/staging/rts_pstor/sd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1680,17 +1680,16 @@ static int sd_tuning_rx(struct rtsx_chip *chip)
int (*tuning_cmd)(struct rtsx_chip *chip, u8 sample_point);

if (CHK_SD(sd_card)) {
if (CHK_SD_DDR50(sd_card)) {
if (CHK_SD_DDR50(sd_card))
tuning_cmd = sd_ddr_tuning_rx_cmd;
} else {
else
tuning_cmd = sd_sdr_tuning_rx_cmd;
}

} else {
if (CHK_MMC_DDR52(sd_card)) {
if (CHK_MMC_DDR52(sd_card))
tuning_cmd = mmc_ddr_tunning_rx_cmd;
} else {
else
TRACE_RET(chip, STATUS_FAIL);
}
}

for (i = 0; i < 3; i++) {
Expand All @@ -1702,27 +1701,24 @@ static int sd_tuning_rx(struct rtsx_chip *chip)
}

retval = tuning_cmd(chip, (u8)j);
if (retval == STATUS_SUCCESS) {
if (retval == STATUS_SUCCESS)
raw_phase_map[i] |= 1 << j;
}
}
}

phase_map = raw_phase_map[0] & raw_phase_map[1] & raw_phase_map[2];
for (i = 0; i < 3; i++) {
for (i = 0; i < 3; i++)
RTSX_DEBUGP("RX raw_phase_map[%d] = 0x%08x\n", i, raw_phase_map[i]);
}

RTSX_DEBUGP("RX phase_map = 0x%08x\n", phase_map);

final_phase = sd_search_final_phase(chip, phase_map, TUNE_RX);
if (final_phase == 0xFF) {
if (final_phase == 0xFF)
TRACE_RET(chip, STATUS_FAIL);
}

retval = sd_change_phase(chip, final_phase, TUNE_RX);
if (retval != STATUS_SUCCESS) {
if (retval != STATUS_SUCCESS)
TRACE_RET(chip, STATUS_FAIL);
}

return STATUS_SUCCESS;
}
Expand Down

0 comments on commit e3eef0c

Please sign in to comment.