michaelh/zephyr
1
0
Fork 0
Code Releases Activity

display: gd7965: 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:44:42 +10:00 • committed by Carles Cufí
commit bd980f3506
1 changed files with 22 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

62
drivers/display/gd7965.c
View file

@ -26,16 +26,9 @@ LOG_MODULE_REGISTER(gd7965, CONFIG_DISPLAY_LOG_LEVEL);
* also first gate/source should be 0. * also first gate/source should be 0.
*/ */
#define GD7965_SPI_FREQ DT_INST_PROP(0, spi_max_frequency)
#define GD7965_BUS_NAME DT_INST_BUS_LABEL(0)
#define GD7965_DC_PIN DT_INST_GPIO_PIN(0, dc_gpios) #define GD7965_DC_PIN DT_INST_GPIO_PIN(0, dc_gpios)
#define GD7965_DC_FLAGS DT_INST_GPIO_FLAGS(0, dc_gpios) #define GD7965_DC_FLAGS DT_INST_GPIO_FLAGS(0, dc_gpios)
#define GD7965_DC_CNTRL DT_INST_GPIO_LABEL(0, dc_gpios) #define GD7965_DC_CNTRL DT_INST_GPIO_LABEL(0, dc_gpios)
#define GD7965_CS_PIN DT_INST_SPI_DEV_CS_GPIOS_PIN(0)
#define GD7965_CS_FLAGS DT_INST_SPI_DEV_CS_GPIOS_FLAGS(0)
#if DT_INST_SPI_DEV_HAS_CS_GPIOS(0)
#define GD7965_CS_CNTRL DT_INST_SPI_DEV_CS_GPIOS_LABEL(0)
#endif
#define GD7965_BUSY_PIN DT_INST_GPIO_PIN(0, busy_gpios) #define GD7965_BUSY_PIN DT_INST_GPIO_PIN(0, busy_gpios)
#define GD7965_BUSY_CNTRL DT_INST_GPIO_LABEL(0, busy_gpios) #define GD7965_BUSY_CNTRL DT_INST_GPIO_LABEL(0, busy_gpios)
#define GD7965_BUSY_FLAGS DT_INST_GPIO_FLAGS(0, busy_gpios) #define GD7965_BUSY_FLAGS DT_INST_GPIO_FLAGS(0, busy_gpios)
@ -57,14 +50,14 @@ LOG_MODULE_REGISTER(gd7965, CONFIG_DISPLAY_LOG_LEVEL);
struct gd7965_data { struct gd7965_data {
const struct gd7965_config *config;
const struct device *reset; const struct device *reset;
const struct device *dc; const struct device *dc;
const struct device *busy; const struct device *busy;
const struct device *spi_dev; };
struct spi_config spi_config;
#if defined(GD7965_CS_CNTRL) struct gd7965_config {
struct spi_cs_control cs_ctrl; struct spi_dt_spec bus;
#endif
}; };
static uint8_t gd7965_softstart[] = DT_INST_PROP(0, softstart); static uint8_t gd7965_softstart[] = DT_INST_PROP(0, softstart);
@ -82,7 +75,7 @@ static inline int gd7965_write_cmd(struct gd7965_data *driver,
struct spi_buf_set buf_set = {.buffers = &buf, .count = 1}; struct spi_buf_set buf_set = {.buffers = &buf, .count = 1};
gpio_pin_set(driver->dc, GD7965_DC_PIN, 1); gpio_pin_set(driver->dc, GD7965_DC_PIN, 1);
if (spi_write(driver->spi_dev, &driver->spi_config, &buf_set)) { if (spi_write_dt(&driver->config->bus, &buf_set)) {
return -EIO; return -EIO;
} }
@ -90,7 +83,7 @@ static inline int gd7965_write_cmd(struct gd7965_data *driver,
buf.buf = data; buf.buf = data;
buf.len = len; buf.len = len;
gpio_pin_set(driver->dc, GD7965_DC_PIN, 0); gpio_pin_set(driver->dc, GD7965_DC_PIN, 0);
if (spi_write(driver->spi_dev, &driver->spi_config, &buf_set)) { if (spi_write_dt(&driver->config->bus, &buf_set)) {
return -EIO; return -EIO;
} }
} }
@ -392,21 +385,16 @@ static int gd7965_controller_init(const struct device *dev)
static int gd7965_init(const struct device *dev) static int gd7965_init(const struct device *dev)
{ {
const struct gd7965_config *config = dev->config;
struct gd7965_data *driver = dev->data; struct gd7965_data *driver = dev->data;
LOG_DBG(""); LOG_DBG("");
driver->spi_dev = device_get_binding(GD7965_BUS_NAME); if (!spi_is_ready(&config->bus)) {
if (driver->spi_dev == NULL) { LOG_ERR("SPI bus %s not ready", config->bus.bus->name);
LOG_ERR("Could not get SPI device for GD7965"); return -ENODEV;
return -EIO;
} }
driver->spi_config.frequency = GD7965_SPI_FREQ;
driver->spi_config.operation = SPI_OP_MODE_MASTER | SPI_WORD_SET(8);
driver->spi_config.slave = DT_INST_REG_ADDR(0);
driver->spi_config.cs = NULL;
driver->reset = device_get_binding(GD7965_RESET_CNTRL); driver->reset = device_get_binding(GD7965_RESET_CNTRL);
if (driver->reset == NULL) { if (driver->reset == NULL) {
LOG_ERR("Could not get GPIO port for GD7965 reset"); LOG_ERR("Could not get GPIO port for GD7965 reset");
@ -434,23 +422,17 @@ static int gd7965_init(const struct device *dev)
gpio_pin_configure(driver->busy, GD7965_BUSY_PIN, gpio_pin_configure(driver->busy, GD7965_BUSY_PIN,
GPIO_INPUT | GD7965_BUSY_FLAGS); GPIO_INPUT | GD7965_BUSY_FLAGS);
#if defined(GD7965_CS_CNTRL)
driver->cs_ctrl.gpio_dev = device_get_binding(GD7965_CS_CNTRL);
if (!driver->cs_ctrl.gpio_dev) {
LOG_ERR("Unable to get SPI GPIO CS device");
return -EIO;
}
driver->cs_ctrl.gpio_pin = GD7965_CS_PIN;
driver->cs_ctrl.gpio_dt_flags = GD7965_CS_FLAGS;
driver->cs_ctrl.delay = 0U;
driver->spi_config.cs = &driver->cs_ctrl;
#endif
return gd7965_controller_init(dev); return gd7965_controller_init(dev);
} }
static struct gd7965_data gd7965_driver; static struct gd7965_data gd7965_driver = {
.config = &gd7965_config
};
static const struct gd7965_config gd7965_config {
.bus = SPI_DT_SPEC_INST_GET(
0, SPI_OP_MODE_MASTER | SPI_WORD_SET(8), 0)
};
static struct display_driver_api gd7965_driver_api = { static struct display_driver_api gd7965_driver_api = {
.blanking_on = gd7965_blanking_on, .blanking_on = gd7965_blanking_on,
@ -467,6 +449,6 @@ static struct display_driver_api gd7965_driver_api = {
DEVICE_DT_INST_DEFINE(0, gd7965_init, NULL, DEVICE_DT_INST_DEFINE(0, gd7965_init, NULL,
&gd7965_driver, NULL, &gd7965_driver, &gd7965_config,
POST_KERNEL, CONFIG_APPLICATION_INIT_PRIORITY, POST_KERNEL, CONFIG_APPLICATION_INIT_PRIORITY,
&gd7965_driver_api); &gd7965_driver_api);