michaelh/zephyr
1
0
Fork 0
Code Releases Activity

display: st7735r: convert to spi_dt_spec

Browse source 
Convert SPI usage to `struct spi_dt_spec`.

Signed-off-by: Jordan Yates <jordan.yates@data61.csiro.au>
This commit is contained in:
Jordan Yates 2021-08-01 16:26:37 +10:00 • committed by Carles Cufí
commit 80dabf52eb
1 changed files with 8 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

46
drivers/display/display_st7735r.c
View file

@ -34,9 +34,7 @@ struct st7735r_gpio_data {
};
struct st7735r_config {
const char *spi_name;
const char *cs_name;
struct spi_config spi_config;
struct spi_dt_spec bus;
struct st7735r_gpio_data cmd_data;
struct st7735r_gpio_data reset;
uint16_t height;
@ -61,8 +59,6 @@ struct st7735r_config {
struct st7735r_data {
const struct st7735r_config *config;
const struct device *spi_dev;
struct spi_cs_control cs_ctrl;
const struct device *cmd_data_dev;
const struct device *reset_dev;
uint16_t x_offset;
@ -92,7 +88,7 @@ static int st7735r_transmit(struct st7735r_data *data, uint8_t cmd,
int ret;
st7735r_set_cmd(data, 1);
ret = spi_write(data->spi_dev, &data->config->spi_config, &tx_bufs);
ret = spi_write_dt(&data->config->bus, &tx_bufs);
if (ret < 0) {
return ret;
}
@ -101,7 +97,7 @@ static int st7735r_transmit(struct st7735r_data *data, uint8_t cmd,
tx_buf.buf = (void *)tx_data;
tx_buf.len = tx_count;
st7735r_set_cmd(data, 0);
ret = spi_write(data->spi_dev, &data->config->spi_config, &tx_bufs);
ret = spi_write_dt(&data->config->bus, &tx_bufs);
if (ret < 0) {
return ret;
}
@ -244,7 +240,7 @@ static int st7735r_write(const struct device *dev,
for (write_cnt = 1U; write_cnt < nbr_of_writes; ++write_cnt) {
tx_buf.buf = (void *)write_data_start;
tx_buf.len = desc->width * ST7735R_PIXEL_SIZE * write_h;
ret = spi_write(data->spi_dev, &data->config->spi_config, &tx_bufs);
ret = spi_write_dt(&data->config->bus, &tx_bufs);
if (ret < 0) {
return ret;
}
@ -446,20 +442,11 @@ static int st7735r_init(const struct device *dev)
struct st7735r_config *config = (struct st7735r_config *)dev->config;
int ret;
data->spi_dev = device_get_binding(config->spi_name);
if (data->spi_dev == NULL) {
LOG_ERR("Could not get SPI device for LCD");
if (!spi_is_ready(&config->bus)) {
LOG_ERR("SPI bus %s not ready", config->bus.bus->name);
return -ENODEV;
}
if (config->cs_name) {
data->cs_ctrl.gpio_dev = device_get_binding(config->cs_name);
if (data->cs_ctrl.gpio_dev == NULL) {
LOG_ERR("Could not get device for SPI CS");
return -ENODEV;
}
}
if (config->reset.name) {
data->reset_dev = device_get_binding(config->reset.name);
if (data->reset_dev == NULL) {
@ -574,18 +561,8 @@ static const struct display_driver_api st7735r_api = {
static struct st7735r_data st7735r_data_ ## inst; \
\
const static struct st7735r_config st7735r_config_ ## inst = { \
.spi_name = DT_INST_BUS_LABEL(inst), \
.cs_name = UTIL_AND( \
DT_INST_SPI_DEV_HAS_CS_GPIOS(inst), \
DT_INST_SPI_DEV_CS_GPIOS_LABEL(inst)), \
.spi_config.slave = DT_INST_REG_ADDR(inst), \
.spi_config.frequency = UTIL_AND( \
DT_HAS_PROP(inst, spi_max_frequency), \
DT_INST_PROP(inst, spi_max_frequency)), \
.spi_config.operation = SPI_OP_MODE_MASTER | SPI_WORD_SET(8), \
.spi_config.cs = UTIL_AND( \
DT_INST_SPI_DEV_HAS_CS_GPIOS(inst), \
&(st7735r_data_ ## inst.cs_ctrl)), \
.bus = SPI_DT_SPEC_INST_GET( \
inst, SPI_OP_MODE_MASTER | SPI_WORD_SET(8), 0), \
.cmd_data.name = DT_INST_GPIO_LABEL(inst, cmd_data_gpios), \
.cmd_data.pin = DT_INST_GPIO_PIN(inst, cmd_data_gpios), \
.cmd_data.flags = DT_INST_GPIO_FLAGS(inst, cmd_data_gpios), \
@ -620,13 +597,6 @@ static const struct display_driver_api st7735r_api = {
\
static struct st7735r_data st7735r_data_ ## inst = { \
.config = &st7735r_config_ ## inst, \
.cs_ctrl.gpio_pin = UTIL_AND( \
DT_INST_SPI_DEV_HAS_CS_GPIOS(inst), \
DT_INST_SPI_DEV_CS_GPIOS_PIN(inst)), \
.cs_ctrl.gpio_dt_flags = UTIL_AND( \
DT_INST_SPI_DEV_HAS_CS_GPIOS(inst), \
DT_INST_SPI_DEV_CS_GPIOS_FLAGS(inst)), \
.cs_ctrl.delay = 0U, \
.x_offset = DT_INST_PROP(inst, x_offset), \
.y_offset = DT_INST_PROP(inst, y_offset), \
}; \