Merge pull request #4096 from Guozhanxin/sdio_fix

BernardXiong · web-flow · commit af95348bf1dd · 2020-11-28T06:48:14.000+08:00
完善sdio框架中切换到高速模式时的时钟设置
diff --git a/components/drivers/sdio/sdio.c b/components/drivers/sdio/sdio.c
@@ -892,9 +892,9 @@ static rt_int32_t sdio_init_card(struct rt_mmcsd_host *host, rt_uint32_t ocr)
 
     if (card->flags & CARD_FLAG_HIGHSPEED) 
     {
-        mmcsd_set_clock(host, 50000000);
-    } 
-    else 
+        mmcsd_set_clock(host, card->host->freq_max > 50000000 ? 50000000 : card->host->freq_max);
+    }
+    else
     {
         mmcsd_set_clock(host, card->cis.max_tran_speed);
     }

Original file line number	Diff line number	Diff line change
`@@ -892,9 +892,9 @@ static rt_int32_t sdio_init_card(struct rt_mmcsd_host *host, rt_uint32_t ocr)`
`892`	`892`
`893`	`893`	`if (card->flags & CARD_FLAG_HIGHSPEED)`
`894`	`894`	`{`
`895`		`- mmcsd_set_clock(host, 50000000);`
`896`		`- }`
`897`		`- else`
	`895`	`+ mmcsd_set_clock(host, card->host->freq_max > 50000000 ? 50000000 : card->host->freq_max);`
	`896`	`+ }`
	`897`	`+ else`
`898`	`898`	`{`
`899`	`899`	`mmcsd_set_clock(host, card->cis.max_tran_speed);`
`900`	`900`	`}`