xobs/fomu-flash
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

spi: use quirks for reading from SR

Browse Source 
Different chips handle reading from SR in different ways.

Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
Sean Cross 2018-12-18 20:52:58 -05:00
parent edd8824a74
commit af1dff1e28
1 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
spi.c
View File

@ -329,8 +329,15 @@ uint8_t spiReadSr(struct ff_spi *spi, int sr) {
} }
void spiWriteSr(struct ff_spi *spi, int sr, uint8_t val) { void spiWriteSr(struct ff_spi *spi, int sr, uint8_t val) {
switch (sr) { switch (sr) {
case 1: case 1:
if (!(spi->quirks & SQ_SKIP_SR_WEL)) {
spiBegin(spi);
spiCommand(spi, 0x06);
spiEnd(spi);
}
spiBegin(spi); spiBegin(spi);
spiCommand(spi, 0x50); spiCommand(spi, 0x50);
spiEnd(spi); spiEnd(spi);
@ -341,18 +348,44 @@ void spiWriteSr(struct ff_spi *spi, int sr, uint8_t val) {
spiEnd(spi); spiEnd(spi);
break; break;
case 2: case 2: {
uint8_t sr1 = 0x00;
if (spi->quirks & SQ_SR2_FROM_SR1)
sr1 = spiReadSr(spi, 1);
if (!(spi->quirks & SQ_SKIP_SR_WEL)) {
spiBegin(spi);
spiCommand(spi, 0x06);
spiEnd(spi);
}
spiBegin(spi); spiBegin(spi);
spiCommand(spi, 0x50); spiCommand(spi, 0x50);
spiEnd(spi); spiEnd(spi);
spiBegin(spi); spiBegin(spi);
spiCommand(spi, 0x31); if (spi->quirks & SQ_SR2_FROM_SR1) {
spiCommand(spi, val); spiCommand(spi, 0x01);
spiCommand(spi, sr1);
spiCommand(spi, val);
}
else {
spiCommand(spi, 0x31);
spiCommand(spi, val);
}
spiEnd(spi); spiEnd(spi);
break; break;
}
case 3: case 3:
if (!(spi->quirks & SQ_SKIP_SR_WEL)) {
spiBegin(spi);
spiCommand(spi, 0x06);
spiEnd(spi);
}
spiBegin(spi); spiBegin(spi);
spiCommand(spi, 0x50); spiCommand(spi, 0x50);
spiEnd(spi); spiEnd(spi);
@ -630,9 +663,16 @@ int spiInit(struct ff_spi *spi) {
// Have the SPI flash pay attention to us // Have the SPI flash pay attention to us
gpioWrite(spi->pins.hold, 1); gpioWrite(spi->pins.hold, 1);
// Disable WP // Disable WP
gpioWrite(spi->pins.wp, 1); gpioWrite(spi->pins.wp, 1);
spi->id = spiId(spi);
if (spi->id.manufacturer_id == 0x1f)
spi->quirks |= SQ_SR2_FROM_SR1;
if (spi->id.manufacturer_id == 0xef)
spi->quirks |= SQ_SKIP_SR_WEL;
return 0; return 0;
} }