Skip to content

Commit cc319ac

Browse files
authored
Merge pull request #3458 from shawn1221/mmc-upstream-20200316
component: sdio: fix potential ricky clock setting
2 parents 822d8f4 + 4c7106f commit cc319ac

File tree

1 file changed

+3
-9
lines changed
  • components/drivers/sdio

1 file changed

+3
-9
lines changed

components/drivers/sdio/mmc.c

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ static int mmc_parse_ext_csd(struct rt_mmcsd_card *card, rt_uint8_t *ext_csd)
191191
}
192192

193193
card->flags |= CARD_FLAG_HIGHSPEED;
194-
card->hs_max_data_rate = 200000000;
194+
card->hs_max_data_rate = 52000000;
195195

196196
card_capacity = *((rt_uint32_t *)&ext_csd[EXT_CSD_SEC_CNT]);
197197
card_capacity *= card->card_blksize;
@@ -513,16 +513,10 @@ static rt_int32_t mmcsd_mmc_init_card(struct rt_mmcsd_host *host,
513513
card->flags |= CARD_FLAG_SDHC;
514514

515515
/* set bus speed */
516-
max_data_rate = (unsigned int)-1;
517516
if (card->flags & CARD_FLAG_HIGHSPEED)
518-
{
519-
if (max_data_rate > card->hs_max_data_rate)
520-
max_data_rate = card->hs_max_data_rate;
521-
}
522-
else if (max_data_rate > card->max_data_rate)
523-
{
517+
max_data_rate = card->hs_max_data_rate;
518+
else
524519
max_data_rate = card->max_data_rate;
525-
}
526520

527521
mmcsd_set_clock(host, max_data_rate);
528522

0 commit comments

Comments
 (0)