diff --git a/litex/soc/software/liblitespi/spiflash.c b/litex/soc/software/liblitespi/spiflash.c
index 548dc33d0..dad526f57 100644
--- a/litex/soc/software/liblitespi/spiflash.c
+++ b/litex/soc/software/liblitespi/spiflash.c
@@ -84,15 +84,8 @@ static void spiflash_master_write(uint32_t val, size_t len, size_t width, uint32
 
 void spiflash_init(void)
 {
-	int ret;
-
 	printf("Initializing %s SPI Flash...\n", SPIFLASH_MODULE_NAME);
 
-	/* Clk frequency auto-calibration. */
-	ret = spiflash_freq_init();
-	if (ret < 0)
-		return;
-
 	/* Dummy bits setup. */
 #ifdef SPIFLASH_MODULE_DUMMY_BITS
 	spiflash_dummy_bits_setup(SPIFLASH_MODULE_DUMMY_BITS);
@@ -115,6 +108,8 @@ void spiflash_init(void)
 
 #endif
 
+	/* Clk frequency auto-calibration. */
+	spiflash_freq_init();
 }
 
 #endif