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

drivers: sdhc: Rework SPI config initialization

Browse source 
Move to using SPI_CONFIG_DT_INST macro to initialization the
struct spi_config cfg_a.  This fixes an issue with how the old
code was initializing the deprecated fields of spi_cs_control.

Signed-off-by: Kumar Gala <galak@kernel.org>
This commit is contained in:
Kumar Gala 2022-06-29 00:58:29 -05:00 committed by Fabio Baltieri
parent 8b6fe35cac
commit 355da1dd84
1 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/sdhc/sdhc_spi.c
View file

@ -742,21 +742,10 @@ static struct sdhc_driver_api sdhc_spi_api = {
.spi_max_freq = DT_INST_PROP(n, spi_max_frequency), \ .spi_max_freq = DT_INST_PROP(n, spi_max_frequency), \
}; \ }; \
\ \
IF_ENABLED(DT_INST_SPI_DEV_HAS_CS_GPIOS(n), \
(struct spi_cs_control sdhc_spi_cs_##n = { \
.gpio_dev = DEVICE_DT_GET(DT_INST_SPI_DEV_CS_GPIOS_CTLR(n)), \
.gpio_pin = DT_INST_SPI_DEV_CS_GPIOS_PIN(n), \
.gpio_dt_flags = DT_INST_SPI_DEV_CS_GPIOS_FLAGS(n), \
};)) \
struct sdhc_spi_data sdhc_spi_data_##n = { \ struct sdhc_spi_data sdhc_spi_data_##n = { \
.cfg_a = { \ .cfg_a = SPI_CONFIG_DT_INST(n, \
.operation = (SPI_LOCK_ON | \ (SPI_LOCK_ON | SPI_HOLD_ON_CS | SPI_WORD_SET(8)),\
SPI_HOLD_ON_CS | \ 0), \
SPI_WORD_SET(8)), \
COND_CODE_1(DT_INST_SPI_DEV_HAS_CS_GPIOS(n), \
(.cs = &sdhc_spi_cs_##n), \
(.cs = NULL)) \
}, \
}; \ }; \
\ \
DEVICE_DT_INST_DEFINE(n, \ DEVICE_DT_INST_DEFINE(n, \