espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 10:47:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

spi_slave: fix slave can't use iomux bus mixed with gpio cs_pin

Browse Source
This commit is contained in:
wanlei
2022-11-28 10:22:25 +08:00
parent c0ba33a99d
commit a6ea6716ce
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/driver/spi_slave.c
View File

@ -68,6 +68,7 @@ typedef struct {
QueueHandle_t trans_queue; QueueHandle_t trans_queue;
QueueHandle_t ret_queue; QueueHandle_t ret_queue;
bool dma_enabled; bool dma_enabled;
bool cs_iomux;
uint32_t tx_dma_chan; uint32_t tx_dma_chan;
uint32_t rx_dma_chan; uint32_t rx_dma_chan;
#ifdef CONFIG_PM_ENABLE #ifdef CONFIG_PM_ENABLE
@ -105,7 +106,7 @@ static void SPI_SLAVE_ISR_ATTR freeze_cs(spi_slave_t *host)
// This is used in test by internal gpio matrix connections // This is used in test by internal gpio matrix connections
static inline void SPI_SLAVE_ISR_ATTR restore_cs(spi_slave_t *host) static inline void SPI_SLAVE_ISR_ATTR restore_cs(spi_slave_t *host)
{ {
if (bus_is_iomux(host)) { if (host->cs_iomux) {
gpio_iomux_in(host->cfg.spics_io_num, spi_periph_signal[host->id].spics_in); gpio_iomux_in(host->cfg.spics_io_num, spi_periph_signal[host->id].spics_in);
} else { } else {
esp_rom_gpio_connect_in_signal(host->cfg.spics_io_num, spi_periph_signal[host->id].spics_in, false); esp_rom_gpio_connect_in_signal(host->cfg.spics_io_num, spi_periph_signal[host->id].spics_in, false);
@ -161,6 +162,8 @@ esp_err_t spi_slave_initialize(spi_host_device_t host, const spi_bus_config_t *b
} }
if (slave_config->spics_io_num >= 0) { if (slave_config->spics_io_num >= 0) {
spicommon_cs_initialize(host, slave_config->spics_io_num, 0, !bus_is_iomux(spihost[host])); spicommon_cs_initialize(host, slave_config->spics_io_num, 0, !bus_is_iomux(spihost[host]));
// check and save where cs line really route through
spihost[host]->cs_iomux = (slave_config->spics_io_num == spi_periph_signal[host].spics0_iomux_pin) && bus_is_iomux(spihost[host]);
} }
// The slave DMA suffers from unexpected transactions. Forbid reading if DMA is enabled by disabling the CS line. // The slave DMA suffers from unexpected transactions. Forbid reading if DMA is enabled by disabling the CS line.