Skip to content

P
Platform-independent core collection
Commit 58695b59 authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

Merge branch 'master' into develop

parents e848e4ba ba3aa59f
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
software/spi-ocores/drivers/spi/spi-ocores.c
View file @ 58695b59
...@@ -467,9 +467,11 @@ static int spi_ocores_sw_xfer_next_init(struct spi_ocores *sp) ...@@ -467,9 +467,11 @@ static int spi_ocores_sw_xfer_next_init(struct spi_ocores *sp)
ctrl = sp->ctrl_base; ctrl = sp->ctrl_base;
if (sp->master->cur_msg->spi->mode & SPI_CPHA) { if (sp->master->cur_msg->spi->mode & SPI_CPHA) {
ctrl |= SPI_OCORES_CTRL_Tx_NEG;
ctrl |= SPI_OCORES_CTRL_Rx_NEG; ctrl |= SPI_OCORES_CTRL_Rx_NEG;
} }
else
ctrl |= SPI_OCORES_CTRL_Tx_NEG;
if (sp->master->cur_msg->spi->mode & SPI_LSB_FIRST) if (sp->master->cur_msg->spi->mode & SPI_LSB_FIRST)
ctrl |= SPI_OCORES_CTRL_LSB; ctrl |= SPI_OCORES_CTRL_LSB;
ctrl |= nbits; ctrl |= nbits;
...@@ -596,7 +598,7 @@ static int spi_ocores_process(struct spi_ocores *sp) ...@@ -596,7 +598,7 @@ static int spi_ocores_process(struct spi_ocores *sp)
spi_ocores_finalize_current_message(sp); spi_ocores_finalize_current_message(sp);
} }
return 0; return err;
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment