Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions src/spi_flash.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,10 @@
#define BYTE_WRITE 0x02
#define AUTOINC 0xAD
#define EWSR 0x50
#define RSTEN 0x66
#define EBSY 0x70
#define DBSY 0x80
#define RST 0x99

#ifdef TEST_EXT_FLASH
static int test_ext_flash(void);
Expand Down Expand Up @@ -186,9 +188,28 @@ uint16_t spi_flash_probe(void)
int i;
spi_init(0,0);
wait_busy();

#ifdef RESET_EXT_FLASH
/* Reset Flash chip as it doesn't always respond properly to first request */
spi_cs_on(SPI_CS_PIO_BASE, SPI_CS_FLASH);
spi_write(RSTEN);
notused = spi_read();
spi_cs_off(SPI_CS_PIO_BASE, SPI_CS_FLASH);
for (i = 0; i < 10; i++);
spi_cs_on(SPI_CS_PIO_BASE, SPI_CS_FLASH);
spi_write(RST);
notused = spi_read();
spi_cs_off(SPI_CS_PIO_BASE, SPI_CS_FLASH);
for (i = 0; i < 18000; i++);

spi_cs_on(SPI_CS_PIO_BASE, SPI_CS_FLASH);
spi_write(MDID);
notused = spi_read();
write_address(0);
#else
notused = spi_read();
#endif

spi_write(0xFF);
manuf = spi_read();
spi_write(0xFF);
Expand Down