From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Fri, 3 Jul 2020 12:43:30 +0000 (+0200)
Subject: litesdcard: update integration.
X-Git-Tag: 24jan2021_ls180~114
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=94821cb73c21da0884f172bc1e4871d550cea82c;p=litex.git

litesdcard: update integration.
---

diff --git a/litex/soc/integration/soc.py b/litex/soc/integration/soc.py
index d8570330..acb3322e 100644
--- a/litex/soc/integration/soc.py
+++ b/litex/soc/integration/soc.py
@@ -1261,7 +1261,7 @@ class LiteXSoC(SoC):
         # Core
         if hasattr(sdcard_pads, "rst"):
             self.comb += sdcard_pads.rst.eq(0)
-        self.submodules.sdphy   = SDPHY(sdcard_pads, self.platform.device)
+        self.submodules.sdphy   = SDPHY(sdcard_pads, self.platform.device, self.clk_freq)
         self.submodules.sdcore  = SDCore(self.sdphy)
         self.add_csr("sdphy")
         self.add_csr("sdcore")
diff --git a/litex/soc/software/liblitesdcard/sdcard.c b/litex/soc/software/liblitesdcard/sdcard.c
index 66a4c876..6d5da7de 100644
--- a/litex/soc/software/liblitesdcard/sdcard.c
+++ b/litex/soc/software/liblitesdcard/sdcard.c
@@ -421,9 +421,6 @@ void sdcard_decode_csd(void) {
 int sdcard_init(void) {
 	unsigned short rca;
 
-	/* initialize SD driver parameters */
-	sdcore_timeout_write(1<<19);
-
 	/* reset card */
 	sdcard_go_idle();
 	busy_wait(1);