michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: wifi: eswifi: Convert to use DT_INST defines

Browse source 
Use DT_INST define as this is the preferred set of defines to utilize
for drivers.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2020-02-11 12:40:40 -06:00 • committed by Kumar Gala
commit 46fe3046fe
2 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
drivers/wifi/eswifi/eswifi_bus_spi.c
View file

@ -226,7 +226,7 @@ int eswifi_spi_init(struct eswifi_dev *eswifi)
struct eswifi_spi_data *spi = &eswifi_spi0; /* Static instance */ struct eswifi_spi_data *spi = &eswifi_spi0; /* Static instance */
/* SPI DEV */ /* SPI DEV */
spi->spi_dev = device_get_binding(DT_INVENTEK_ESWIFI_ESWIFI0_BUS_NAME); spi->spi_dev = device_get_binding(DT_INST_0_INVENTEK_ESWIFI_BUS_NAME);
if (!spi->spi_dev) { if (!spi->spi_dev) {
LOG_ERR("Failed to initialize SPI driver"); LOG_ERR("Failed to initialize SPI driver");
return -ENODEV; return -ENODEV;
@ -234,26 +234,26 @@ int eswifi_spi_init(struct eswifi_dev *eswifi)
/* SPI DATA READY PIN */ /* SPI DATA READY PIN */
spi->dr.dev = device_get_binding( spi->dr.dev = device_get_binding(
DT_INVENTEK_ESWIFI_ESWIFI0_DATA_GPIOS_CONTROLLER); DT_INST_0_INVENTEK_ESWIFI_DATA_GPIOS_CONTROLLER);
if (!spi->dr.dev) { if (!spi->dr.dev) {
LOG_ERR("Failed to initialize GPIO driver: %s", LOG_ERR("Failed to initialize GPIO driver: %s",
DT_INVENTEK_ESWIFI_ESWIFI0_DATA_GPIOS_CONTROLLER); DT_INST_0_INVENTEK_ESWIFI_DATA_GPIOS_CONTROLLER);
return -ENODEV; return -ENODEV;
} }
spi->dr.pin = DT_INVENTEK_ESWIFI_ESWIFI0_DATA_GPIOS_PIN; spi->dr.pin = DT_INST_0_INVENTEK_ESWIFI_DATA_GPIOS_PIN;
gpio_pin_configure(spi->dr.dev, spi->dr.pin, gpio_pin_configure(spi->dr.dev, spi->dr.pin,
DT_INVENTEK_ESWIFI_ESWIFI0_DATA_GPIOS_FLAGS | DT_INST_0_INVENTEK_ESWIFI_DATA_GPIOS_FLAGS |
GPIO_INPUT); GPIO_INPUT);
/* SPI CONFIG/CS */ /* SPI CONFIG/CS */
spi->spi_cfg.frequency = DT_INVENTEK_ESWIFI_ESWIFI0_SPI_MAX_FREQUENCY; spi->spi_cfg.frequency = DT_INST_0_INVENTEK_ESWIFI_SPI_MAX_FREQUENCY;
spi->spi_cfg.operation = (SPI_OP_MODE_MASTER | SPI_TRANSFER_MSB | spi->spi_cfg.operation = (SPI_OP_MODE_MASTER | SPI_TRANSFER_MSB |
SPI_WORD_SET(16) | SPI_LINES_SINGLE | SPI_WORD_SET(16) | SPI_LINES_SINGLE |
SPI_HOLD_ON_CS | SPI_LOCK_ON); SPI_HOLD_ON_CS | SPI_LOCK_ON);
spi->spi_cfg.slave = DT_INVENTEK_ESWIFI_ESWIFI0_BASE_ADDRESS; spi->spi_cfg.slave = DT_INST_0_INVENTEK_ESWIFI_BASE_ADDRESS;
spi->spi_cs.gpio_dev = spi->spi_cs.gpio_dev =
device_get_binding(DT_INVENTEK_ESWIFI_ESWIFI0_CS_GPIOS_CONTROLLER); device_get_binding(DT_INST_0_INVENTEK_ESWIFI_CS_GPIOS_CONTROLLER);
spi->spi_cs.gpio_pin = DT_INVENTEK_ESWIFI_ESWIFI0_CS_GPIOS_PIN; spi->spi_cs.gpio_pin = DT_INST_0_INVENTEK_ESWIFI_CS_GPIOS_PIN;
spi->spi_cs.delay = 1000U; spi->spi_cs.delay = 1000U;
spi->spi_cfg.cs = &spi->spi_cs; spi->spi_cfg.cs = &spi->spi_cs;

16
drivers/wifi/eswifi/eswifi_core.c
View file

@ -638,27 +638,27 @@ static int eswifi_init(struct device *dev)
eswifi->bus->init(eswifi); eswifi->bus->init(eswifi);
eswifi->resetn.dev = device_get_binding( eswifi->resetn.dev = device_get_binding(
DT_INVENTEK_ESWIFI_ESWIFI0_RESETN_GPIOS_CONTROLLER); DT_INST_0_INVENTEK_ESWIFI_RESETN_GPIOS_CONTROLLER);
if (!eswifi->resetn.dev) { if (!eswifi->resetn.dev) {
LOG_ERR("Failed to initialize GPIO driver: %s", LOG_ERR("Failed to initialize GPIO driver: %s",
DT_INVENTEK_ESWIFI_ESWIFI0_RESETN_GPIOS_CONTROLLER); DT_INST_0_INVENTEK_ESWIFI_RESETN_GPIOS_CONTROLLER);
return -ENODEV; return -ENODEV;
} }
eswifi->resetn.pin = DT_INVENTEK_ESWIFI_ESWIFI0_RESETN_GPIOS_PIN; eswifi->resetn.pin = DT_INST_0_INVENTEK_ESWIFI_RESETN_GPIOS_PIN;
gpio_pin_configure(eswifi->resetn.dev, eswifi->resetn.pin, gpio_pin_configure(eswifi->resetn.dev, eswifi->resetn.pin,
DT_INVENTEK_ESWIFI_ESWIFI0_RESETN_GPIOS_FLAGS | DT_INST_0_INVENTEK_ESWIFI_RESETN_GPIOS_FLAGS |
GPIO_OUTPUT_INACTIVE); GPIO_OUTPUT_INACTIVE);
eswifi->wakeup.dev = device_get_binding( eswifi->wakeup.dev = device_get_binding(
DT_INVENTEK_ESWIFI_ESWIFI0_WAKEUP_GPIOS_CONTROLLER); DT_INST_0_INVENTEK_ESWIFI_WAKEUP_GPIOS_CONTROLLER);
if (!eswifi->wakeup.dev) { if (!eswifi->wakeup.dev) {
LOG_ERR("Failed to initialize GPIO driver: %s", LOG_ERR("Failed to initialize GPIO driver: %s",
DT_INVENTEK_ESWIFI_ESWIFI0_WAKEUP_GPIOS_CONTROLLER); DT_INST_0_INVENTEK_ESWIFI_WAKEUP_GPIOS_CONTROLLER);
return -ENODEV; return -ENODEV;
} }
eswifi->wakeup.pin = DT_INVENTEK_ESWIFI_ESWIFI0_WAKEUP_GPIOS_PIN; eswifi->wakeup.pin = DT_INST_0_INVENTEK_ESWIFI_WAKEUP_GPIOS_PIN;
gpio_pin_configure(eswifi->wakeup.dev, eswifi->wakeup.pin, gpio_pin_configure(eswifi->wakeup.dev, eswifi->wakeup.pin,
DT_INVENTEK_ESWIFI_ESWIFI0_WAKEUP_GPIOS_FLAGS | DT_INST_0_INVENTEK_ESWIFI_WAKEUP_GPIOS_FLAGS |
GPIO_OUTPUT_ACTIVE); GPIO_OUTPUT_ACTIVE);
k_work_q_start(&eswifi->work_q, eswifi_work_q_stack, k_work_q_start(&eswifi->work_q, eswifi_work_q_stack,