Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #558 from antmicro/fix-function-names-liblitespi 

litex/soc/software/liblitespi: fix names associated with PHY CSRs
This commit is contained in:
enjoy-digital 2020-06-03 16:34:55 +02:00 committed by GitHub
parent fb4b6c35a3 eceee7e4c4
commit efbe169063
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
litex/soc/software/liblitespi/spiflash.c
View File

@ -12,7 +12,7 @@
#include "spiflash.h" #include "spiflash.h"
#ifdef CSR_SPIFLASH_MMAP_BASE #if defined(CSR_SPIFLASH_PHY_BASE) && defined(CSR_SPIFLASH_MMAP_BASE)
#define DEBUG 0 #define DEBUG 0
#define USER_DEFINED_DUMMY_BITS 0 #define USER_DEFINED_DUMMY_BITS 0
@ -29,7 +29,7 @@ static void spi_set_mode(spi_mode mode)
int spiflash_freq_init(void) int spiflash_freq_init(void)
{ {
unsigned int lowest_div = spiflash_mmap_clk_divisor_read(); unsigned int lowest_div = spiflash_phy_clk_divisor_read();
unsigned int crc = crc32((unsigned char *)SPIFLASH_BASE, SPI_FLASH_BLOCK_SIZE); unsigned int crc = crc32((unsigned char *)SPIFLASH_BASE, SPI_FLASH_BLOCK_SIZE);
unsigned int crc_test = crc; unsigned int crc_test = crc;
@ -49,7 +49,7 @@ int spiflash_freq_init(void)
for(int i = lowest_div; (crc == crc_test) && (i >= 0); i--) { for(int i = lowest_div; (crc == crc_test) && (i >= 0); i--) {
lowest_div = i; lowest_div = i;
spiflash_mmap_clk_divisor_write((uint32_t)i); spiflash_phy_clk_divisor_write((uint32_t)i);
crc_test = crc32((unsigned char *)SPIFLASH_BASE, SPI_FLASH_BLOCK_SIZE); crc_test = crc32((unsigned char *)SPIFLASH_BASE, SPI_FLASH_BLOCK_SIZE);
#if DEBUG #if DEBUG
printf("[DIV: %d] %08x\n\r", i, crc_test); printf("[DIV: %d] %08x\n\r", i, crc_test);
@ -58,14 +58,14 @@ int spiflash_freq_init(void)
lowest_div++; lowest_div++;
printf("SPIFlash freq configured to %d MHz\n", (spiflash_mmap_sys_clk_freq_read()/(2*(1 + lowest_div)))/1000000); printf("SPIFlash freq configured to %d MHz\n", (spiflash_mmap_sys_clk_freq_read()/(2*(1 + lowest_div)))/1000000);
spiflash_mmap_clk_divisor_write(lowest_div); spiflash_phy_clk_divisor_write(lowest_div);
return 0; return 0;
} }
void spiflash_dummy_bits_setup(unsigned int dummy_bits) void spiflash_dummy_bits_setup(unsigned int dummy_bits)
{ {
spiflash_mmap_dummy_bits_write((uint32_t)dummy_bits); spiflash_phy_dummy_bits_write((uint32_t)dummy_bits);
#if DEBUG #if DEBUG
printf("Dummy bits set to: %d\n\r", spi_dummy_bits_read()); printf("Dummy bits set to: %d\n\r", spi_dummy_bits_read());
#endif #endif