michaelh/zephyr
1
0
Fork 0
Code Releases Activity

display: ssd1306: convert to _dt_spec

Browse source 
Convert the ssd1306 driver to `spi_dt_spec` and `i2c_dt_spec`.

Signed-off-by: Jordan Yates <jordan.yates@data61.csiro.au>
This commit is contained in:
Jordan Yates 2021-08-04 22:11:22 +10:00 • committed by Christopher Friedt
commit 7b42f8960a
1 changed files with 66 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

141
drivers/display/ssd1306.c
View file

@ -47,40 +47,61 @@ LOG_MODULE_REGISTER(ssd1306, CONFIG_DISPLAY_LOG_LEVEL);
#define SSD1306_ADDRESSING_MODE (SSD1306_SET_MEM_ADDRESSING_HORIZONTAL) #define SSD1306_ADDRESSING_MODE (SSD1306_SET_MEM_ADDRESSING_HORIZONTAL)
#endif #endif
struct ssd1306_data { struct ssd1306_config {
const struct device *reset; #if DT_INST_ON_BUS(0, i2c)
const struct device *bus; struct i2c_dt_spec bus;
#if DT_INST_ON_BUS(0, spi) #elif DT_INST_ON_BUS(0, spi)
struct spi_cs_control cs_ctrl; struct spi_dt_spec bus;
struct spi_config spi_config; struct gpio_dt_spec data_cmd;
const struct device *data_cmd;
#endif #endif
struct gpio_dt_spec reset;
};
struct ssd1306_data {
uint8_t contrast; uint8_t contrast;
uint8_t scan_mode; uint8_t scan_mode;
}; };
#if DT_INST_ON_BUS(0, i2c) #if DT_INST_ON_BUS(0, i2c)
static inline bool ssd1306_bus_ready(const struct device *dev)
{
const struct ssd1306_config *config = dev->config;
return device_is_ready(config->bus.bus);
}
static inline int ssd1306_write_bus(const struct device *dev, static inline int ssd1306_write_bus(const struct device *dev,
uint8_t *buf, size_t len, bool command) uint8_t *buf, size_t len, bool command)
{ {
struct ssd1306_data *driver = dev->data; const struct ssd1306_config *config = dev->config;
return i2c_burst_write(driver->bus, DT_INST_REG_ADDR(0), return i2c_burst_write_dt(&config->bus,
command ? SSD1306_CONTROL_ALL_BYTES_CMD : command ? SSD1306_CONTROL_ALL_BYTES_CMD :
SSD1306_CONTROL_ALL_BYTES_DATA, SSD1306_CONTROL_ALL_BYTES_DATA,
buf, len); buf, len);
} }
#elif DT_INST_ON_BUS(0, spi) #elif DT_INST_ON_BUS(0, spi)
static inline bool ssd1306_bus_ready(const struct device *dev)
{
const struct ssd1306_config *config = dev->config;
if (gpio_pin_configure_dt(&config->data_cmd, GPIO_OUTPUT_INACTIVE) < 0) {
return false;
}
return spi_is_ready(&config->bus);
}
static inline int ssd1306_write_bus(const struct device *dev, static inline int ssd1306_write_bus(const struct device *dev,
uint8_t *buf, size_t len, bool command) uint8_t *buf, size_t len, bool command)
{ {
struct ssd1306_data *driver = dev->data; const struct ssd1306_config *config = dev->config;
int errno; int errno;
gpio_pin_set(driver->data_cmd, DT_INST_GPIO_PIN(0, data_cmd_gpios), gpio_pin_set_dt(&config->data_cmd, command ? 0 : 1);
command ? 0 : 1);
struct spi_buf tx_buf = { struct spi_buf tx_buf = {
.buf = buf, .buf = buf,
.len = len .len = len
@ -91,7 +112,7 @@ static inline int ssd1306_write_bus(const struct device *dev,
.count = 1 .count = 1
}; };
errno = spi_write(driver->bus, &driver->spi_config, &tx_bufs); errno = spi_write_dt(&config->bus, &tx_bufs);
return errno; return errno;
} }
@ -322,6 +343,8 @@ static int ssd1306_set_pixel_format(const struct device *dev,
static int ssd1306_init_device(const struct device *dev) static int ssd1306_init_device(const struct device *dev)
{ {
const struct ssd1306_config *config = dev->config;
uint8_t cmd_buf[] = { uint8_t cmd_buf[] = {
SSD1306_SET_ENTIRE_DISPLAY_OFF, SSD1306_SET_ENTIRE_DISPLAY_OFF,
#ifdef CONFIG_SSD1306_REVERSE_MODE #ifdef CONFIG_SSD1306_REVERSE_MODE
@ -331,16 +354,13 @@ static int ssd1306_init_device(const struct device *dev)
#endif #endif
}; };
#if DT_INST_NODE_HAS_PROP(0, reset_gpios) /* Reset if pin connected */
struct ssd1306_data *driver = dev->data; if (config->reset.port) {
k_sleep(K_MSEC(SSD1306_RESET_DELAY));
k_sleep(K_MSEC(SSD1306_RESET_DELAY)); gpio_pin_set_dt(&config->reset, 1);
gpio_pin_set(driver->reset, k_sleep(K_MSEC(SSD1306_RESET_DELAY));
DT_INST_GPIO_PIN(0, reset_gpios), 1); gpio_pin_set_dt(&config->reset, 0);
k_sleep(K_MSEC(SSD1306_RESET_DELAY)); }
gpio_pin_set(driver->reset,
DT_INST_GPIO_PIN(0, reset_gpios), 0);
#endif
/* Turn display off */ /* Turn display off */
if (ssd1306_suspend(dev)) { if (ssd1306_suspend(dev)) {
@ -378,60 +398,19 @@ static int ssd1306_init_device(const struct device *dev)
static int ssd1306_init(const struct device *dev) static int ssd1306_init(const struct device *dev)
{ {
struct ssd1306_data *driver = dev->data; const struct ssd1306_config *config = dev->config;
LOG_DBG(""); LOG_DBG("");
driver->bus = device_get_binding(DT_INST_BUS_LABEL(0)); if (!ssd1306_bus_ready(dev)) {
if (driver->bus == NULL) { LOG_ERR("Bus device %s not ready!", config->bus.bus->name);
LOG_ERR("Failed to get pointer to %s device!",
DT_INST_BUS_LABEL(0));
return -EINVAL; return -EINVAL;
} }
#if DT_INST_NODE_HAS_PROP(0, reset_gpios) if (config->reset.port) {
driver->reset = device_get_binding( gpio_pin_configure_dt(&config->reset, GPIO_OUTPUT_INACTIVE);
DT_INST_GPIO_LABEL(0, reset_gpios));
if (driver->reset == NULL) {
LOG_ERR("Failed to get pointer to %s device!",
DT_INST_GPIO_LABEL(0, reset_gpios));
return -EINVAL;
} }
gpio_pin_configure(driver->reset,
DT_INST_GPIO_PIN(0, reset_gpios),
GPIO_OUTPUT_INACTIVE |
DT_INST_GPIO_FLAGS(0, reset_gpios));
#endif
#if DT_INST_ON_BUS(0, spi)
driver->spi_config.frequency = DT_INST_PROP(0, spi_max_frequency);
driver->spi_config.operation = SPI_OP_MODE_MASTER | SPI_TRANSFER_MSB |
SPI_WORD_SET(8) | SPI_LINES_SINGLE;
driver->spi_config.slave = DT_INST_REG_ADDR(0);
#if DT_INST_SPI_DEV_HAS_CS_GPIOS(0)
driver->cs_ctrl.gpio_dev = device_get_binding(
DT_INST_SPI_DEV_CS_GPIOS_LABEL(0));
driver->cs_ctrl.gpio_pin = DT_INST_SPI_DEV_CS_GPIOS_PIN(0);
driver->cs_ctrl.gpio_dt_flags = DT_INST_SPI_DEV_CS_GPIOS_FLAGS(0);
driver->cs_ctrl.delay = 0U;
driver->spi_config.cs = &driver->cs_ctrl;
#endif /* DT_INST_SPI_DEV_HAS_CS_GPIOS(0) */
driver->data_cmd = device_get_binding(
DT_INST_GPIO_LABEL(0, data_cmd_gpios));
if (driver->data_cmd == NULL) {
LOG_ERR("Failed to get pointer to %s device!",
DT_INST_GPIO_LABEL(0, data_cmd_gpios));
return -EINVAL;
}
gpio_pin_configure(driver->data_cmd,
DT_INST_GPIO_PIN(0, data_cmd_gpios),
GPIO_OUTPUT_INACTIVE |
DT_INST_GPIO_FLAGS(0, data_cmd_gpios));
#endif /* DT_INST_ON_BUS(0, spi) */
if (ssd1306_init_device(dev)) { if (ssd1306_init_device(dev)) {
LOG_ERR("Failed to initialize device!"); LOG_ERR("Failed to initialize device!");
return -EIO; return -EIO;
@ -440,6 +419,18 @@ static int ssd1306_init(const struct device *dev)
return 0; return 0;
} }
static const struct ssd1306_config ssd1306_config = {
#if DT_INST_ON_BUS(0, i2c)
.bus = I2C_DT_SPEC_INST_GET(0),
#elif DT_INST_ON_BUS(0, spi)
.bus = SPI_DT_SPEC_INST_GET(
0, SPI_OP_MODE_MASTER | SPI_TRANSFER_MSB |
SPI_WORD_SET(8) | SPI_LINES_SINGLE, 0),
.data_cmd = GPIO_DT_SPEC_INST_GET(0, data_cmd_gpios),
#endif
.reset = GPIO_DT_SPEC_INST_GET_OR(0, reset_gpios, { 0 })
};
static struct ssd1306_data ssd1306_driver; static struct ssd1306_data ssd1306_driver;
static struct display_driver_api ssd1306_driver_api = { static struct display_driver_api ssd1306_driver_api = {
@ -456,6 +447,6 @@ static struct display_driver_api ssd1306_driver_api = {
}; };
DEVICE_DT_INST_DEFINE(0, ssd1306_init, NULL, DEVICE_DT_INST_DEFINE(0, ssd1306_init, NULL,
&ssd1306_driver, NULL, &ssd1306_driver, &ssd1306_config,
POST_KERNEL, CONFIG_APPLICATION_INIT_PRIORITY, POST_KERNEL, CONFIG_APPLICATION_INIT_PRIORITY,
&ssd1306_driver_api); &ssd1306_driver_api);