michaelh/zephyr
1
0
Fork 0
Code Releases Activity

display: ili9340: Convert to new DT_<COMPAT>_<INSTANCE> defines

Browse source 
Convert ili9340 display driver to use new defines so we can remove
the dts_fixup.h code for it.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2019-01-29 10:39:47 -06:00 • committed by Kumar Gala
commit d0aca3b92c
3 changed files with 13 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

26
drivers/display/display_ili9340.c
View file

@ -41,15 +41,15 @@ static int ili9340_init(struct device *dev)
LOG_DBG("Initializing display driver"); LOG_DBG("Initializing display driver");
data->spi_dev = device_get_binding(DT_ILI9340_SPI_DEV_NAME); data->spi_dev = device_get_binding(DT_ILITEK_ILI9340_0_BUS_NAME);
if (data->spi_dev == NULL) { if (data->spi_dev == NULL) {
LOG_ERR("Could not get SPI device for ILI9340"); LOG_ERR("Could not get SPI device for ILI9340");
return -EPERM; return -EPERM;
} }
data->spi_config.frequency = DT_ILI9340_SPI_FREQ; data->spi_config.frequency = DT_ILITEK_ILI9340_0_SPI_MAX_FREQUENCY;
data->spi_config.operation = SPI_OP_MODE_MASTER | SPI_WORD_SET(8); data->spi_config.operation = SPI_OP_MODE_MASTER | SPI_WORD_SET(8);
data->spi_config.slave = DT_ILI9340_SPI_SLAVE_NUMBER; data->spi_config.slave = DT_ILITEK_ILI9340_0_BASE_ADDRESS;
#ifdef CONFIG_ILI9340_GPIO_CS #ifdef CONFIG_ILI9340_GPIO_CS
data->cs_ctrl.gpio_dev = data->cs_ctrl.gpio_dev =
@ -62,31 +62,31 @@ static int ili9340_init(struct device *dev)
#endif #endif
data->reset_gpio = data->reset_gpio =
device_get_binding(DT_ILI9340_RESET_GPIO_PORT_NAME); device_get_binding(DT_ILITEK_ILI9340_0_RESET_GPIOS_CONTROLLER);
if (data->reset_gpio == NULL) { if (data->reset_gpio == NULL) {
LOG_ERR("Could not get GPIO port for ILI9340 reset"); LOG_ERR("Could not get GPIO port for ILI9340 reset");
return -EPERM; return -EPERM;
} }
gpio_pin_configure(data->reset_gpio, DT_ILI9340_RESET_PIN, gpio_pin_configure(data->reset_gpio, DT_ILITEK_ILI9340_0_RESET_GPIOS_PIN,
GPIO_DIR_OUT); GPIO_DIR_OUT);
data->command_data_gpio = data->command_data_gpio =
device_get_binding(DT_ILI9340_CMD_DATA_GPIO_PORT_NAME); device_get_binding(DT_ILITEK_ILI9340_0_CMD_DATA_GPIOS_CONTROLLER);
if (data->command_data_gpio == NULL) { if (data->command_data_gpio == NULL) {
LOG_ERR("Could not get GPIO port for ILI9340 command/data"); LOG_ERR("Could not get GPIO port for ILI9340 command/data");
return -EPERM; return -EPERM;
} }
gpio_pin_configure(data->command_data_gpio, DT_ILI9340_CMD_DATA_PIN, gpio_pin_configure(data->command_data_gpio, DT_ILITEK_ILI9340_0_CMD_DATA_GPIOS_PIN,
GPIO_DIR_OUT); GPIO_DIR_OUT);
LOG_DBG("Resetting display driver"); LOG_DBG("Resetting display driver");
gpio_pin_write(data->reset_gpio, DT_ILI9340_RESET_PIN, 1); gpio_pin_write(data->reset_gpio, DT_ILITEK_ILI9340_0_RESET_GPIOS_PIN, 1);
k_sleep(1); k_sleep(1);
gpio_pin_write(data->reset_gpio, DT_ILI9340_RESET_PIN, 0); gpio_pin_write(data->reset_gpio, DT_ILITEK_ILI9340_0_RESET_GPIOS_PIN, 0);
k_sleep(1); k_sleep(1);
gpio_pin_write(data->reset_gpio, DT_ILI9340_RESET_PIN, 1); gpio_pin_write(data->reset_gpio, DT_ILITEK_ILI9340_0_RESET_GPIOS_PIN, 1);
k_sleep(5); k_sleep(5);
LOG_DBG("Initializing LCD"); LOG_DBG("Initializing LCD");
@ -242,7 +242,7 @@ void ili9340_transmit(struct ili9340_data *data, u8_t cmd, void *tx_data,
struct spi_buf tx_buf = { .buf = &cmd, .len = 1 }; struct spi_buf tx_buf = { .buf = &cmd, .len = 1 };
struct spi_buf_set tx_bufs = { .buffers = &tx_buf, .count = 1 }; struct spi_buf_set tx_bufs = { .buffers = &tx_buf, .count = 1 };
gpio_pin_write(data->command_data_gpio, DT_ILI9340_CMD_DATA_PIN, gpio_pin_write(data->command_data_gpio, DT_ILITEK_ILI9340_0_CMD_DATA_GPIOS_PIN,
ILI9340_CMD_DATA_PIN_COMMAND); ILI9340_CMD_DATA_PIN_COMMAND);
spi_write(data->spi_dev, &data->spi_config, &tx_bufs); spi_write(data->spi_dev, &data->spi_config, &tx_bufs);
@ -250,7 +250,7 @@ void ili9340_transmit(struct ili9340_data *data, u8_t cmd, void *tx_data,
tx_buf.buf = tx_data; tx_buf.buf = tx_data;
tx_buf.len = tx_len; tx_buf.len = tx_len;
gpio_pin_write(data->command_data_gpio, gpio_pin_write(data->command_data_gpio,
DT_ILI9340_CMD_DATA_PIN, DT_ILITEK_ILI9340_0_CMD_DATA_GPIOS_PIN,
ILI9340_CMD_DATA_PIN_DATA); ILI9340_CMD_DATA_PIN_DATA);
spi_write(data->spi_dev, &data->spi_config, &tx_bufs); spi_write(data->spi_dev, &data->spi_config, &tx_bufs);
} }
@ -271,6 +271,6 @@ static const struct display_driver_api ili9340_api = {
static struct ili9340_data ili9340_data; static struct ili9340_data ili9340_data;
DEVICE_AND_API_INIT(ili9340, DT_ILI9340_DEV_NAME, &ili9340_init, DEVICE_AND_API_INIT(ili9340, DT_ILITEK_ILI9340_0_LABEL, &ili9340_init,
&ili9340_data, NULL, APPLICATION, &ili9340_data, NULL, APPLICATION,
CONFIG_APPLICATION_INIT_PRIORITY, &ili9340_api); CONFIG_APPLICATION_INIT_PRIORITY, &ili9340_api);

35
samples/display/ili9340/dts_fixup.h
View file

@ -1,35 +0,0 @@
/*
* Copyright (c) 2017 Jan Van Winkel <jan.van_winkel@dxplore.eu>
*
* SPDX-License-Identifier: Apache-2.0
*/
#if defined(CONFIG_SPI_STM32) && defined(CONFIG_ILI9340)
#define DT_ILI9340_SPI_DEV_NAME \
DT_ST_STM32_SPI_FIFO_40013000_ILITEK_ILI9340_0_BUS_NAME
#define DT_ILI9340_SPI_SLAVE_NUMBER \
DT_ST_STM32_SPI_FIFO_40013000_ILITEK_ILI9340_0_BASE_ADDRESS
#define DT_ILI9340_CMD_DATA_GPIO_PORT_NAME \
DT_ST_STM32_SPI_FIFO_40013000_ILITEK_ILI9340_0_CMD_DATA_GPIOS_CONTROLLER
#define DT_ILI9340_CMD_DATA_PIN \
DT_ST_STM32_SPI_FIFO_40013000_ILITEK_ILI9340_0_CMD_DATA_GPIOS_PIN
#define DT_ILI9340_DEV_NAME \
DT_ST_STM32_SPI_FIFO_40013000_ILITEK_ILI9340_0_LABEL
#define DT_ILI9340_RESET_GPIO_PORT_NAME \
DT_ST_STM32_SPI_FIFO_40013000_ILITEK_ILI9340_0_RESET_GPIOS_CONTROLLER
#define DT_ILI9340_RESET_PIN \
DT_ST_STM32_SPI_FIFO_40013000_ILITEK_ILI9340_0_RESET_GPIOS_PIN
#define DT_ILI9340_SPI_FREQ \
DT_ST_STM32_SPI_FIFO_40013000_ILITEK_ILI9340_0_SPI_MAX_FREQUENCY
#endif

40
samples/gui/lvgl/dts_fixup.h
View file

@ -1,40 +0,0 @@
/*
* Copyright (c) 2018 Jan Van Winkel <jan.van_winkel@dxplore.eu>
*
* SPDX-License-Identifier: Apache-2.0
*/
#if defined(CONFIG_SPI_NRFX) && defined(CONFIG_ILI9340)
#define DT_ILI9340_SPI_DEV_NAME \
DT_NORDIC_NRF_SPI_40004000_ILITEK_ILI9340_0_BUS_NAME
#define DT_ILI9340_SPI_SLAVE_NUMBER \
DT_NORDIC_NRF_SPI_40004000_ILITEK_ILI9340_0_BASE_ADDRESS
#define DT_ILI9340_CMD_DATA_GPIO_PORT_NAME \
DT_NORDIC_NRF_SPI_40004000_ILITEK_ILI9340_0_CMD_DATA_GPIOS_CONTROLLER
#define DT_ILI9340_CMD_DATA_PIN \
DT_NORDIC_NRF_SPI_40004000_ILITEK_ILI9340_0_CMD_DATA_GPIOS_PIN
#define DT_ILI9340_DEV_NAME \
DT_NORDIC_NRF_SPI_40004000_ILITEK_ILI9340_0_LABEL
#define DT_ILI9340_RESET_GPIO_PORT_NAME \
DT_NORDIC_NRF_SPI_40004000_ILITEK_ILI9340_0_RESET_GPIOS_CONTROLLER
#define DT_ILI9340_RESET_PIN \
DT_NORDIC_NRF_SPI_40004000_ILITEK_ILI9340_0_RESET_GPIOS_PIN
#define DT_ILI9340_SPI_FREQ \
DT_NORDIC_NRF_SPI_40004000_ILITEK_ILI9340_0_SPI_MAX_FREQUENCY
#define DT_ILI9340_CS_GPIO_PORT_NAME \
DT_NORDIC_NRF_SPI_40004000_CS_GPIOS_CONTROLLER
#define DT_ILI9340_CS_GPIO_PIN \
DT_NORDIC_NRF_SPI_40004000_CS_GPIOS_PIN
#endif