patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

drivers: spi_nrfx_spim/spi: Fix initialization of CS GPIOs

Browse source 
This is a follow-up to commits 99daca9bba
and ae03c0a6bf.

nRF SPI driver shims cannot use devicetree instance indexes, they need
to use the DT_NODELABEL macro and SoC peripheral instance indexes.
Correct the macros used in initialization of CS GPIOs in those shims.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This commit is contained in:
Andrzej Głąbek 2021-11-05 10:57:31 +01:00 committed by Carles Cufí
parent 6d269fcedc
commit f7466d28fd
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/spi/spi_nrfx_spi.c
View file

@ -339,7 +339,7 @@ static int spi_nrfx_pm_action(const struct device *dev,
static struct spi_nrfx_data spi_##idx##_data = { \ static struct spi_nrfx_data spi_##idx##_data = { \
SPI_CONTEXT_INIT_LOCK(spi_##idx##_data, ctx), \ SPI_CONTEXT_INIT_LOCK(spi_##idx##_data, ctx), \
SPI_CONTEXT_INIT_SYNC(spi_##idx##_data, ctx), \ SPI_CONTEXT_INIT_SYNC(spi_##idx##_data, ctx), \
SPI_CONTEXT_CS_GPIOS_INITIALIZE(DT_DRV_INST(idx), ctx) \ SPI_CONTEXT_CS_GPIOS_INITIALIZE(SPI(idx), ctx) \
.dev = DEVICE_DT_GET(SPI(idx)), \ .dev = DEVICE_DT_GET(SPI(idx)), \
.busy = false, \ .busy = false, \
}; \ }; \

2
drivers/spi/spi_nrfx_spim.c
View file

@ -405,7 +405,7 @@ static int spim_nrfx_pm_action(const struct device *dev,
static struct spi_nrfx_data spi_##idx##_data = { \ static struct spi_nrfx_data spi_##idx##_data = { \
SPI_CONTEXT_INIT_LOCK(spi_##idx##_data, ctx), \ SPI_CONTEXT_INIT_LOCK(spi_##idx##_data, ctx), \
SPI_CONTEXT_INIT_SYNC(spi_##idx##_data, ctx), \ SPI_CONTEXT_INIT_SYNC(spi_##idx##_data, ctx), \
SPI_CONTEXT_CS_GPIOS_INITIALIZE(DT_DRV_INST(idx), ctx) \ SPI_CONTEXT_CS_GPIOS_INITIALIZE(SPIM(idx), ctx) \
.dev = DEVICE_DT_GET(SPIM(idx)), \ .dev = DEVICE_DT_GET(SPIM(idx)), \
.busy = false, \ .busy = false, \
}; \ }; \