michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: display: Update the MCUX ELCDIF driver

Browse source 
1. Rename device data to dev_data to fix variable
   name clash
2. Use Device Tree properties to setup the display
3. Delete unused Kconfigs

Signed-off-by: Mahesh Mahadevan <mahesh.mahadevan@nxp.com>
This commit is contained in:
Mahesh Mahadevan 2022-02-01 22:18:36 -06:00 • committed by David Leach
commit 45cc1d6fc7
2 changed files with 92 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

9
drivers/display/Kconfig.mcux_elcdif
View file

@ -33,13 +33,4 @@ config MCUX_ELCDIF_POOL_BLOCK_ALIGN
help help
Byte alignment in the frame buffer memory pool. Byte alignment in the frame buffer memory pool.
choice MCUX_ELCDIF_PANEL
prompt "Panel selection"
default MCUX_ELCDIF_PANEL_RK043FN02H
config MCUX_ELCDIF_PANEL_RK043FN02H
bool "Rocktech rk043fn02h-ct"
endchoice
endif # DISPLAY_MCUX_ELCDIF endif # DISPLAY_MCUX_ELCDIF

170
drivers/display/display_mcux_elcdif.c
View file

@ -17,6 +17,10 @@
LOG_MODULE_REGISTER(display_mcux_elcdif, CONFIG_DISPLAY_LOG_LEVEL); LOG_MODULE_REGISTER(display_mcux_elcdif, CONFIG_DISPLAY_LOG_LEVEL);
/* Pixel formats */
#define MCUX_ELCDIF_PIXEL_FORMAT_RGB888 0U
#define MCUX_ELCDIF_PIXEL_FORMAT_BGR565 1U
K_HEAP_DEFINE(mcux_elcdif_pool, K_HEAP_DEFINE(mcux_elcdif_pool,
CONFIG_MCUX_ELCDIF_POOL_BLOCK_MAX * CONFIG_MCUX_ELCDIF_POOL_BLOCK_MAX *
CONFIG_MCUX_ELCDIF_POOL_BLOCK_NUM); CONFIG_MCUX_ELCDIF_POOL_BLOCK_NUM);
@ -25,8 +29,7 @@ struct mcux_elcdif_config {
LCDIF_Type *base; LCDIF_Type *base;
void (*irq_config_func)(const struct device *dev); void (*irq_config_func)(const struct device *dev);
elcdif_rgb_mode_config_t rgb_mode; elcdif_rgb_mode_config_t rgb_mode;
enum display_pixel_format pixel_format; uint8_t pixel_format;
uint8_t bits_per_pixel;
}; };
struct mcux_mem_block { struct mcux_mem_block {
@ -39,6 +42,7 @@ struct mcux_elcdif_data {
size_t pixel_bytes; size_t pixel_bytes;
size_t fb_bytes; size_t fb_bytes;
uint8_t write_idx; uint8_t write_idx;
enum display_pixel_format pixel_format;
}; };
static int mcux_elcdif_write(const struct device *dev, const uint16_t x, static int mcux_elcdif_write(const struct device *dev, const uint16_t x,
@ -47,44 +51,44 @@ static int mcux_elcdif_write(const struct device *dev, const uint16_t x,
const void *buf) const void *buf)
{ {
const struct mcux_elcdif_config *config = dev->config; const struct mcux_elcdif_config *config = dev->config;
struct mcux_elcdif_data *data = dev->data; struct mcux_elcdif_data *dev_data = dev->data;
uint8_t write_idx = data->write_idx; uint8_t write_idx = dev_data->write_idx;
uint8_t read_idx = !write_idx; uint8_t read_idx = !write_idx;
int h_idx; int h_idx;
const uint8_t *src; const uint8_t *src;
uint8_t *dst; uint8_t *dst;
__ASSERT((data->pixel_bytes * desc->pitch * desc->height) <= __ASSERT((dev_data->pixel_bytes * desc->pitch * desc->height) <=
desc->buf_size, "Input buffer too small"); desc->buf_size, "Input buffer too small");
LOG_DBG("W=%d, H=%d, @%d,%d", desc->width, desc->height, x, y); LOG_DBG("W=%d, H=%d, @%d,%d", desc->width, desc->height, x, y);
k_sem_take(&data->sem, K_FOREVER); k_sem_take(&dev_data->sem, K_FOREVER);
memcpy(data->fb[write_idx].data, data->fb[read_idx].data, memcpy(dev_data->fb[write_idx].data, dev_data->fb[read_idx].data,
data->fb_bytes); dev_data->fb_bytes);
src = buf; src = buf;
dst = data->fb[data->write_idx].data; dst = dev_data->fb[dev_data->write_idx].data;
dst += data->pixel_bytes * (y * config->rgb_mode.panelWidth + x); dst += dev_data->pixel_bytes * (y * config->rgb_mode.panelWidth + x);
for (h_idx = 0; h_idx < desc->height; h_idx++) { for (h_idx = 0; h_idx < desc->height; h_idx++) {
memcpy(dst, src, data->pixel_bytes * desc->width); memcpy(dst, src, dev_data->pixel_bytes * desc->width);
src += data->pixel_bytes * desc->pitch; src += dev_data->pixel_bytes * desc->pitch;
dst += data->pixel_bytes * config->rgb_mode.panelWidth; dst += dev_data->pixel_bytes * config->rgb_mode.panelWidth;
} }
#ifdef CONFIG_HAS_MCUX_CACHE #ifdef CONFIG_HAS_MCUX_CACHE
DCACHE_CleanByRange((uint32_t) data->fb[write_idx].data, DCACHE_CleanByRange((uint32_t) dev_data->fb[write_idx].data,
data->fb_bytes); dev_data->fb_bytes);
#endif #endif
ELCDIF_SetNextBufferAddr(config->base, ELCDIF_SetNextBufferAddr(config->base,
(uint32_t) data->fb[write_idx].data); (uint32_t) dev_data->fb[write_idx].data);
data->write_idx = read_idx; dev_data->write_idx = read_idx;
return 0; return 0;
} }
@ -134,9 +138,9 @@ static int mcux_elcdif_set_pixel_format(const struct device *dev,
const enum display_pixel_format const enum display_pixel_format
pixel_format) pixel_format)
{ {
const struct mcux_elcdif_config *config = dev->config; struct mcux_elcdif_data *dev_data = dev->data;
if (pixel_format == config->pixel_format) { if (pixel_format == dev_data->pixel_format) {
return 0; return 0;
} }
LOG_ERR("Pixel format change not implemented"); LOG_ERR("Pixel format change not implemented");
@ -157,52 +161,66 @@ static void mcux_elcdif_get_capabilities(const struct device *dev,
struct display_capabilities *capabilities) struct display_capabilities *capabilities)
{ {
const struct mcux_elcdif_config *config = dev->config; const struct mcux_elcdif_config *config = dev->config;
struct mcux_elcdif_data *dev_data = dev->data;
memset(capabilities, 0, sizeof(struct display_capabilities)); memset(capabilities, 0, sizeof(struct display_capabilities));
capabilities->x_resolution = config->rgb_mode.panelWidth; capabilities->x_resolution = config->rgb_mode.panelWidth;
capabilities->y_resolution = config->rgb_mode.panelHeight; capabilities->y_resolution = config->rgb_mode.panelHeight;
capabilities->supported_pixel_formats = config->pixel_format; capabilities->supported_pixel_formats = dev_data->pixel_format;
capabilities->current_pixel_format = config->pixel_format; capabilities->current_pixel_format = dev_data->pixel_format;
capabilities->current_orientation = DISPLAY_ORIENTATION_NORMAL; capabilities->current_orientation = DISPLAY_ORIENTATION_NORMAL;
} }
static void mcux_elcdif_isr(const struct device *dev) static void mcux_elcdif_isr(const struct device *dev)
{ {
const struct mcux_elcdif_config *config = dev->config; const struct mcux_elcdif_config *config = dev->config;
struct mcux_elcdif_data *data = dev->data; struct mcux_elcdif_data *dev_data = dev->data;
uint32_t status; uint32_t status;
status = ELCDIF_GetInterruptStatus(config->base); status = ELCDIF_GetInterruptStatus(config->base);
ELCDIF_ClearInterruptStatus(config->base, status); ELCDIF_ClearInterruptStatus(config->base, status);
k_sem_give(&data->sem); k_sem_give(&dev_data->sem);
} }
static int mcux_elcdif_init(const struct device *dev) static int mcux_elcdif_init(const struct device *dev)
{ {
const struct mcux_elcdif_config *config = dev->config; const struct mcux_elcdif_config *config = dev->config;
struct mcux_elcdif_data *data = dev->data; struct mcux_elcdif_data *dev_data = dev->data;
int i; int i;
elcdif_rgb_mode_config_t rgb_mode = config->rgb_mode; elcdif_rgb_mode_config_t rgb_mode = config->rgb_mode;
data->pixel_bytes = config->bits_per_pixel / 8U; /* Shift the polarity bits to the appropriate location in the register */
data->fb_bytes = data->pixel_bytes * rgb_mode.polarityFlags = rgb_mode.polarityFlags << LCDIF_VDCTRL0_ENABLE_POL_SHIFT;
rgb_mode.panelWidth * rgb_mode.panelHeight;
data->write_idx = 1U;
for (i = 0; i < ARRAY_SIZE(data->fb); i++) { /* Set the Pixel format */
data->fb[i].data = k_heap_alloc(&mcux_elcdif_pool, if (config->pixel_format == MCUX_ELCDIF_PIXEL_FORMAT_BGR565) {
data->fb_bytes, K_NO_WAIT); rgb_mode.pixelFormat = kELCDIF_PixelFormatRGB565;
if (data->fb[i].data == NULL) { dev_data->pixel_format = PIXEL_FORMAT_BGR_565;
dev_data->pixel_bytes = 2;
} else if (config->pixel_format == MCUX_ELCDIF_PIXEL_FORMAT_RGB888) {
rgb_mode.pixelFormat = kELCDIF_PixelFormatRGB888;
dev_data->pixel_format = PIXEL_FORMAT_RGB_888;
dev_data->pixel_bytes = 3;
}
dev_data->fb_bytes = dev_data->pixel_bytes *
rgb_mode.panelWidth * rgb_mode.panelHeight;
dev_data->write_idx = 1U;
for (i = 0; i < ARRAY_SIZE(dev_data->fb); i++) {
dev_data->fb[i].data = k_heap_alloc(&mcux_elcdif_pool,
dev_data->fb_bytes, K_NO_WAIT);
if (dev_data->fb[i].data == NULL) {
LOG_ERR("Could not allocate frame buffer %d", i); LOG_ERR("Could not allocate frame buffer %d", i);
return -ENOMEM; return -ENOMEM;
} }
memset(data->fb[i].data, 0, data->fb_bytes); memset(dev_data->fb[i].data, 0, dev_data->fb_bytes);
} }
rgb_mode.bufferAddr = (uint32_t) data->fb[0].data; rgb_mode.bufferAddr = (uint32_t) dev_data->fb[0].data;
k_sem_init(&data->sem, 1, 1); k_sem_init(&dev_data->sem, 1, 1);
config->irq_config_func(dev); config->irq_config_func(dev);
@ -227,47 +245,43 @@ static const struct display_driver_api mcux_elcdif_api = {
.set_orientation = mcux_elcdif_set_orientation, .set_orientation = mcux_elcdif_set_orientation,
}; };
static void mcux_elcdif_config_func_1(const struct device *dev); #define MCUX_ELDCIF_DEVICE(id) \
static void mcux_elcdif_config_func_##id(const struct device *dev); \
static struct mcux_elcdif_config mcux_elcdif_config_1 = { static const struct mcux_elcdif_config mcux_elcdif_config_##id = { \
.base = (LCDIF_Type *) DT_INST_REG_ADDR(0), .base = (LCDIF_Type *) DT_INST_REG_ADDR(id), \
.irq_config_func = mcux_elcdif_config_func_1, .irq_config_func = mcux_elcdif_config_func_##id, \
#ifdef CONFIG_MCUX_ELCDIF_PANEL_RK043FN02H .rgb_mode = { \
.rgb_mode = { .panelWidth = DT_INST_PROP(id, width), \
.panelWidth = 480, .panelHeight = DT_INST_PROP(id, height), \
.panelHeight = 272, .hsw = DT_INST_PROP(id, hsync), \
.hsw = 41, .hfp = DT_INST_PROP(id, hfp), \
.hfp = 4, .hbp = DT_INST_PROP(id, hbp), \
.hbp = 8, .vsw = DT_INST_PROP(id, vsync), \
.vsw = 10, .vfp = DT_INST_PROP(id, vfp), \
.vfp = 4, .vbp = DT_INST_PROP(id, vbp), \
.vbp = 2, .polarityFlags = DT_INST_PROP(id, polarity), \
.polarityFlags = kELCDIF_DataEnableActiveHigh | .dataBus = LCDIF_CTRL_LCD_DATABUS_WIDTH( \
kELCDIF_VsyncActiveLow | DT_INST_ENUM_IDX(id, data_buswidth)), \
kELCDIF_HsyncActiveLow | }, \
kELCDIF_DriveDataOnRisingClkEdge, .pixel_format = DT_INST_ENUM_IDX(id, pixel_format), \
.pixelFormat = kELCDIF_PixelFormatRGB565, }; \
.dataBus = kELCDIF_DataBus16Bit, static struct mcux_elcdif_data mcux_elcdif_data_##id; \
}, DEVICE_DT_INST_DEFINE(id, \
.pixel_format = PIXEL_FORMAT_BGR_565, &mcux_elcdif_init, \
.bits_per_pixel = 16, NULL, \
#endif &mcux_elcdif_data_##id, \
}; &mcux_elcdif_config_##id, \
POST_KERNEL, \
static struct mcux_elcdif_data mcux_elcdif_data_1; CONFIG_DISPLAY_INIT_PRIORITY, \
&mcux_elcdif_api); \
DEVICE_DT_INST_DEFINE(0, static void mcux_elcdif_config_func_##id(const struct device *dev) \
&mcux_elcdif_init, { \
NULL, IRQ_CONNECT(DT_INST_IRQN(id), \
&mcux_elcdif_data_1, &mcux_elcdif_config_1, DT_INST_IRQ(id, priority), \
POST_KERNEL, CONFIG_DISPLAY_INIT_PRIORITY, mcux_elcdif_isr, \
&mcux_elcdif_api); DEVICE_DT_INST_GET(id), \
0); \
static void mcux_elcdif_config_func_1(const struct device *dev) irq_enable(DT_INST_IRQN(id)); \
{
IRQ_CONNECT(DT_INST_IRQN(0),
DT_INST_IRQ(0, priority),
mcux_elcdif_isr, DEVICE_DT_INST_GET(0), 0);
irq_enable(DT_INST_IRQN(0));
} }
DT_INST_FOREACH_STATUS_OKAY(MCUX_ELDCIF_DEVICE)