michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: display: ls0xx: use gpio_dt_spec

Browse source 
Simplify driver implementation by using gpio_dt_spec. As a result, the
driver data structure has become unused and so removed.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
This commit is contained in:
Gerard Marull-Paretas 2022-01-31 12:56:12 +01:00 • committed by Anas Nashif
commit 0fa2c45037
1 changed files with 31 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

76
drivers/display/ls0xx.c
View file

@ -42,31 +42,26 @@ LOG_MODULE_REGISTER(ls0xx, CONFIG_DISPLAY_LOG_LEVEL);
#define LS0XX_BIT_VCOM 0x02
#define LS0XX_BIT_CLEAR 0x04
struct ls0xx_data {
#if DT_INST_NODE_HAS_PROP(0, disp_en_gpios)
const struct device *disp_dev;
#endif
#if DT_INST_NODE_HAS_PROP(0, extcomin_gpios)
const struct device *extcomin_dev;
#endif
};
struct ls0xx_config {
struct spi_dt_spec bus;
#if DT_INST_NODE_HAS_PROP(0, disp_en_gpios)
struct gpio_dt_spec disp_en_gpio;
#endif
#if DT_INST_NODE_HAS_PROP(0, extcomin_gpios)
struct gpio_dt_spec extcomin_gpio;
#endif
};
#if DT_INST_NODE_HAS_PROP(0, extcomin_gpios)
/* Driver will handle VCOM toggling */
static void ls0xx_vcom_toggle(void *a, void *b, void *c)
{
struct ls0xx_data *driver = (struct ls0xx_data *)a;
const struct ls0xx_config *config = a;
while (1) {
gpio_pin_toggle(driver->extcomin_dev,
DT_INST_GPIO_PIN(0, extcomin_gpios));
gpio_pin_toggle_dt(&config->extcomin_gpio);
k_usleep(3);
gpio_pin_toggle(driver->extcomin_dev,
DT_INST_GPIO_PIN(0, extcomin_gpios));
gpio_pin_toggle_dt(&config->extcomin_gpio);
k_msleep(1000 / DT_INST_PROP(0, extcomin_frequency));
}
}
@ -78,10 +73,9 @@ struct k_thread vcom_toggle_thread;
static int ls0xx_blanking_off(const struct device *dev)
{
#if DT_INST_NODE_HAS_PROP(0, disp_en_gpios)
struct ls0xx_data *driver = dev->data;
const struct ls0xx_config *config = dev->config;
return gpio_pin_set(driver->disp_dev,
DT_INST_GPIO_PIN(0, disp_en_gpios), 1);
return gpio_pin_set_dt(&config->disp_en_gpio, 1);
#else
LOG_WRN("Unsupported");
return -ENOTSUP;
@ -91,10 +85,9 @@ static int ls0xx_blanking_off(const struct device *dev)
static int ls0xx_blanking_on(const struct device *dev)
{
#if DT_INST_NODE_HAS_PROP(0, disp_en_gpios)
struct ls0xx_data *driver = dev->data;
const struct ls0xx_config *config = dev->config;
return gpio_pin_set(driver->disp_dev,
DT_INST_GPIO_PIN(0, disp_en_gpios), 0);
return gpio_pin_set_dt(&config->disp_en_gpio, 0);
#else
LOG_WRN("Unsupported");
return -ENOTSUP;
@ -270,7 +263,6 @@ static int ls0xx_set_pixel_format(const struct device *dev,
static int ls0xx_init(const struct device *dev)
{
const struct ls0xx_config *config = dev->config;
struct ls0xx_data *driver = dev->data;
if (!spi_is_ready(&config->bus)) {
LOG_ERR("SPI bus %s not ready", config->bus.bus->name);
@ -278,36 +270,28 @@ static int ls0xx_init(const struct device *dev)
}
#if DT_INST_NODE_HAS_PROP(0, disp_en_gpios)
driver->disp_dev = device_get_binding(
DT_INST_GPIO_LABEL(0, disp_en_gpios));
if (driver->disp_dev == NULL) {
LOG_ERR("Could not get DISP pin port for LS0XX");
return -EIO;
if (!device_is_ready(config->disp_en_gpio.port)) {
LOG_ERR("DISP port device not ready");
return -ENODEV;
}
LOG_INF("Configuring DISP pin to OUTPUT_HIGH");
gpio_pin_configure(driver->disp_dev,
DT_INST_GPIO_PIN(0, disp_en_gpios),
GPIO_OUTPUT_HIGH);
gpio_pin_configure_dt(&config->disp_en_gpio, GPIO_OUTPUT_HIGH);
#endif
#if DT_INST_NODE_HAS_PROP(0, extcomin_gpios)
driver->extcomin_dev = device_get_binding(
DT_INST_GPIO_LABEL(0, extcomin_gpios));
if (driver->extcomin_dev == NULL) {
LOG_ERR("Could not get EXTCOMIN pin port for LS0XX");
return -EIO;
if (!device_is_ready(config->extcomin_gpio.port)) {
LOG_ERR("EXTCOMIN port device not ready");
return -ENODEV;
}
LOG_INF("Configuring EXTCOMIN pin");
gpio_pin_configure(driver->extcomin_dev,
DT_INST_GPIO_PIN(0, extcomin_gpios),
GPIO_OUTPUT_LOW);
gpio_pin_configure_dt(&config->extcomin_gpio, GPIO_OUTPUT_LOW);
/* Start thread for toggling VCOM */
k_tid_t vcom_toggle_tid = k_thread_create(&vcom_toggle_thread,
vcom_toggle_stack,
K_THREAD_STACK_SIZEOF(vcom_toggle_stack),
ls0xx_vcom_toggle,
driver, NULL, NULL,
config, NULL, NULL,
3, 0, K_NO_WAIT);
k_thread_name_set(vcom_toggle_tid, "ls0xx_vcom");
#endif /* DT_INST_NODE_HAS_PROP(0, extcomin_gpios) */
@ -316,13 +300,17 @@ static int ls0xx_init(const struct device *dev)
return ls0xx_clear(dev);
}
static struct ls0xx_data ls0xx_driver;
static const struct ls0xx_config ls0xx_config = {
.bus = SPI_DT_SPEC_INST_GET(
0, SPI_OP_MODE_MASTER | SPI_WORD_SET(8) |
SPI_TRANSFER_LSB | SPI_CS_ACTIVE_HIGH |
SPI_HOLD_ON_CS | SPI_LOCK_ON, 0)
SPI_HOLD_ON_CS | SPI_LOCK_ON, 0),
#if DT_INST_NODE_HAS_PROP(0, disp_en_gpios)
.disp_en_gpio = GPIO_DT_SPEC_INST_GET(0, disp_en_gpios),
#endif
#if DT_INST_NODE_HAS_PROP(0, extcomin_gpios)
.extcomin_gpio = GPIO_DT_SPEC_INST_GET(0, extcomin_gpios),
#endif
};
static struct display_driver_api ls0xx_driver_api = {
@ -338,7 +326,5 @@ static struct display_driver_api ls0xx_driver_api = {
.set_orientation = ls0xx_set_orientation,
};
DEVICE_DT_INST_DEFINE(0, ls0xx_init, NULL,
&ls0xx_driver, &ls0xx_config,
POST_KERNEL, CONFIG_DISPLAY_INIT_PRIORITY,
&ls0xx_driver_api);
DEVICE_DT_INST_DEFINE(0, ls0xx_init, NULL, NULL, &ls0xx_config, POST_KERNEL,
CONFIG_DISPLAY_INIT_PRIORITY, &ls0xx_driver_api);