Drop the struct ili9805_instr and the init table
and use init functions.
Signed-off-by: Michail Tatas <[email protected]>
---
drivers/gpu/drm/panel/panel-ilitek-ili9805.c | 156 +++++++++----------
1 file changed, 73 insertions(+), 83 deletions(-)
diff --git a/drivers/gpu/drm/panel/panel-ilitek-ili9805.c
b/drivers/gpu/drm/panel/panel-ilitek-ili9805.c
index 7e9587afebbe..a70b9512746a 100644
--- a/drivers/gpu/drm/panel/panel-ilitek-ili9805.c
+++ b/drivers/gpu/drm/panel/panel-ilitek-ili9805.c
@@ -25,22 +25,9 @@
#define ILI9805_SETEXTC_PARAMETER2 (0x98)
#define ILI9805_SETEXTC_PARAMETER3 (0x05)
-#define ILI9805_INSTR(_delay, ...) { \
- .delay = (_delay), \
- .len = sizeof((u8[]) {__VA_ARGS__}), \
- .data = (u8[]){__VA_ARGS__} \
- }
-
-struct ili9805_instr {
- size_t len;
- const u8 *data;
- u32 delay;
-};
-
struct ili9805_desc {
const char *name;
- const struct ili9805_instr *init;
- const size_t init_length;
+ void (*init)(struct mipi_dsi_multi_context *ctx);
const struct drm_display_mode *mode;
u32 width_mm;
u32 height_mm;
@@ -56,65 +43,78 @@ struct ili9805 {
struct gpio_desc *reset_gpio;
};
-static const struct ili9805_instr gpm1780a0_init[] = {
- ILI9805_INSTR(100, ILI9805_EXTCMD_CMD_SET_ENABLE_REG,
ILI9805_SETEXTC_PARAMETER1,
- ILI9805_SETEXTC_PARAMETER2, ILI9805_SETEXTC_PARAMETER3),
- ILI9805_INSTR(100, 0xFD, 0x0F, 0x10, 0x44, 0x00),
- ILI9805_INSTR(0, 0xf8, 0x18, 0x02, 0x02, 0x18, 0x02, 0x02, 0x30, 0x00,
- 0x00, 0x30, 0x00, 0x00, 0x30, 0x00, 0x00),
- ILI9805_INSTR(0, 0xB8, 0x62),
- ILI9805_INSTR(0, 0xF1, 0x00),
- ILI9805_INSTR(0, 0xF2, 0x00, 0x58, 0x40),
- ILI9805_INSTR(0, 0xF3, 0x60, 0x83, 0x04),
- ILI9805_INSTR(0, 0xFC, 0x04, 0x0F, 0x01),
- ILI9805_INSTR(0, 0xEB, 0x08, 0x0F),
- ILI9805_INSTR(0, 0xe0, 0x00, 0x08, 0x0d, 0x0e, 0x0e, 0x0d, 0x0a, 0x08,
0x04,
- 0x08, 0x0d, 0x0f, 0x0b, 0x1c, 0x14, 0x0a),
- ILI9805_INSTR(0, 0xe1, 0x00, 0x08, 0x0d, 0x0e, 0x0e, 0x0d, 0x0a, 0x08,
0x04,
- 0x08, 0x0d, 0x0f, 0x0b, 0x1c, 0x14, 0x0a),
- ILI9805_INSTR(10, 0xc1, 0x13, 0x39, 0x19, 0x06),
- ILI9805_INSTR(10, 0xc7, 0xe5),
- ILI9805_INSTR(10, 0xB1, 0x00, 0x12, 0x14),
- ILI9805_INSTR(10, 0xB4, 0x02),
- ILI9805_INSTR(0, 0xBB, 0x14, 0x55),
- ILI9805_INSTR(0, MIPI_DCS_SET_ADDRESS_MODE, 0x08),
- ILI9805_INSTR(0, MIPI_DCS_SET_PIXEL_FORMAT, 0x77),
- ILI9805_INSTR(0, 0x20),
- ILI9805_INSTR(0, 0xB0, 0x01),
- ILI9805_INSTR(0, 0xB6, 0x31, 0x00, 0xef),
- ILI9805_INSTR(0, 0xDF, 0x23),
- ILI9805_INSTR(0, 0xB9, 0x02, 0x00),
-};
+static void gpm1780a0_init(struct mipi_dsi_multi_context *ctx)
+{
+ mipi_dsi_dcs_write_seq_multi(ctx, ILI9805_EXTCMD_CMD_SET_ENABLE_REG,
ILI9805_SETEXTC_PARAMETER1,
+
ILI9805_SETEXTC_PARAMETER2, ILI9805_SETEXTC_PARAMETER3);
+ mipi_dsi_msleep(ctx, 100);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xFD, 0x0F, 0x10, 0x44, 0x00);
+ mipi_dsi_msleep(ctx, 100);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xf8, 0x18, 0x02, 0x02, 0x18, 0x02,
0x02, 0x30, 0x00,
+ 0x00, 0x30, 0x00, 0x00,
0x30, 0x00, 0x00);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xB8, 0x62);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xF1, 0x00);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xF2, 0x00, 0x58, 0x40);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xF3, 0x60, 0x83, 0x04);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xFC, 0x04, 0x0F, 0x01);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xEB, 0x08, 0x0F);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xe0, 0x00, 0x08, 0x0d, 0x0e, 0x0e,
0x0d, 0x0a, 0x08, 0x04,
+ 0x08, 0x0d, 0x0f, 0x0b,
0x1c, 0x14, 0x0a);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xe1, 0x00, 0x08, 0x0d, 0x0e, 0x0e,
0x0d, 0x0a, 0x08, 0x04,
+ 0x08, 0x0d, 0x0f, 0x0b,
0x1c, 0x14, 0x0a);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xc1, 0x13, 0x39, 0x19, 0x06);
+ mipi_dsi_msleep(ctx, 10);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xc7, 0xe5);
+ mipi_dsi_msleep(ctx, 10);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xB1, 0x00, 0x12, 0x14);
+ mipi_dsi_msleep(ctx, 10);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xB4, 0x02);
+ mipi_dsi_msleep(ctx, 10);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xBB, 0x14, 0x55);
+ mipi_dsi_dcs_write_seq_multi(ctx, MIPI_DCS_SET_ADDRESS_MODE, 0x08);
+ mipi_dsi_dcs_write_seq_multi(ctx, MIPI_DCS_SET_PIXEL_FORMAT, 0x77);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0x20);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xB0, 0x01);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xB6, 0x31, 0x00, 0xef);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xDF, 0x23);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xB9, 0x02, 0x00);
+}
-static const struct ili9805_instr tm041xdhg01_init[] = {
- ILI9805_INSTR(100, ILI9805_EXTCMD_CMD_SET_ENABLE_REG,
ILI9805_SETEXTC_PARAMETER1,
- ILI9805_SETEXTC_PARAMETER2, ILI9805_SETEXTC_PARAMETER3),
- ILI9805_INSTR(100, 0xFD, 0x0F, 0x13, 0x44, 0x00),
- ILI9805_INSTR(0, 0xf8, 0x18, 0x02, 0x02, 0x18, 0x02, 0x02, 0x30, 0x01,
- 0x01, 0x30, 0x01, 0x01, 0x30, 0x01, 0x01),
- ILI9805_INSTR(0, 0xB8, 0x74),
- ILI9805_INSTR(0, 0xF1, 0x00),
- ILI9805_INSTR(0, 0xF2, 0x00, 0x58, 0x40),
- ILI9805_INSTR(0, 0xFC, 0x04, 0x0F, 0x01),
- ILI9805_INSTR(0, 0xEB, 0x08, 0x0F),
- ILI9805_INSTR(0, 0xe0, 0x01, 0x0d, 0x15, 0x0e, 0x0f, 0x0f, 0x0b, 0x08,
0x04,
- 0x07, 0x0a, 0x0d, 0x0c, 0x15, 0x0f, 0x08),
- ILI9805_INSTR(0, 0xe1, 0x01, 0x0d, 0x15, 0x0e, 0x0f, 0x0f, 0x0b, 0x08,
0x04,
- 0x07, 0x0a, 0x0d, 0x0c, 0x15, 0x0f, 0x08),
- ILI9805_INSTR(10, 0xc1, 0x15, 0x03, 0x03, 0x31),
- ILI9805_INSTR(10, 0xB1, 0x00, 0x12, 0x14),
- ILI9805_INSTR(10, 0xB4, 0x02),
- ILI9805_INSTR(0, 0xBB, 0x14, 0x55),
- ILI9805_INSTR(0, MIPI_DCS_SET_ADDRESS_MODE, 0x0a),
- ILI9805_INSTR(0, MIPI_DCS_SET_PIXEL_FORMAT, 0x77),
- ILI9805_INSTR(0, 0x20),
- ILI9805_INSTR(0, 0xB0, 0x00),
- ILI9805_INSTR(0, 0xB6, 0x01),
- ILI9805_INSTR(0, 0xc2, 0x11),
- ILI9805_INSTR(0, 0x51, 0xFF),
- ILI9805_INSTR(0, 0x53, 0x24),
- ILI9805_INSTR(0, 0x55, 0x00),
-};
+static void tm041xdhg01_init(struct mipi_dsi_multi_context *ctx)
+{
+ mipi_dsi_dcs_write_seq_multi(ctx, ILI9805_EXTCMD_CMD_SET_ENABLE_REG,
ILI9805_SETEXTC_PARAMETER1,
+
ILI9805_SETEXTC_PARAMETER2, ILI9805_SETEXTC_PARAMETER3);
+ mipi_dsi_msleep(ctx, 100);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xFD, 0x0F, 0x13, 0x44, 0x00);
+ mipi_dsi_msleep(ctx, 100);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xf8, 0x18, 0x02, 0x02, 0x18, 0x02,
0x02, 0x30, 0x01,
+ 0x01, 0x30, 0x01, 0x01,
0x30, 0x01, 0x01);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xB8, 0x74);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xF1, 0x00);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xF2, 0x00, 0x58, 0x40);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xFC, 0x04, 0x0F, 0x01);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xEB, 0x08, 0x0F);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xe0, 0x01, 0x0d, 0x15, 0x0e, 0x0f,
0x0f, 0x0b, 0x08, 0x04,
+ 0x07, 0x0a, 0x0d, 0x0c,
0x15, 0x0f, 0x08);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xe1, 0x01, 0x0d, 0x15, 0x0e, 0x0f,
0x0f, 0x0b, 0x08, 0x04,
+ 0x07, 0x0a, 0x0d, 0x0c,
0x15, 0x0f, 0x08);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xc1, 0x15, 0x03, 0x03, 0x31);
+ mipi_dsi_msleep(ctx, 10);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xB1, 0x00, 0x12, 0x14);
+ mipi_dsi_msleep(ctx, 10);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xB4, 0x02);
+ mipi_dsi_msleep(ctx, 10);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xBB, 0x14, 0x55);
+ mipi_dsi_dcs_write_seq_multi(ctx, MIPI_DCS_SET_ADDRESS_MODE, 0x0a);
+ mipi_dsi_dcs_write_seq_multi(ctx, MIPI_DCS_SET_PIXEL_FORMAT, 0x77);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0x20);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xB0, 0x00);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xB6, 0x01);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0xc2, 0x11);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0x51, 0xFF);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0x53, 0x24);
+ mipi_dsi_dcs_write_seq_multi(ctx, 0x55, 0x00);
+}
static inline struct ili9805 *panel_to_ili9805(struct drm_panel *panel)
{
@@ -160,16 +160,8 @@ static int ili9805_power_off(struct ili9805 *ctx)
static int ili9805_activate(struct ili9805 *ctx)
{
struct mipi_dsi_multi_context dsi_ctx = { .dsi = ctx->dsi };
- int i;
- for (i = 0; i < ctx->desc->init_length; i++) {
- const struct ili9805_instr *instr = &ctx->desc->init[i];
-
- mipi_dsi_dcs_write_buffer_multi(&dsi_ctx, instr->data,
instr->len);
-
- if (instr->delay > 0)
- mipi_dsi_msleep(&dsi_ctx, instr->delay);
- }
+ ctx->desc->init(&dsi_ctx);
mipi_dsi_dcs_exit_sleep_mode_multi(&dsi_ctx);
mipi_dsi_usleep_range(&dsi_ctx, 5000, 6000);
@@ -343,7 +335,6 @@ static void ili9805_dsi_remove(struct mipi_dsi_device *dsi)
static const struct ili9805_desc gpm1780a0_desc = {
.init = gpm1780a0_init,
- .init_length = ARRAY_SIZE(gpm1780a0_init),
.mode = &gpm1780a0_timing,
.width_mm = 65,
.height_mm = 65,
@@ -351,7 +342,6 @@ static const struct ili9805_desc gpm1780a0_desc = {
static const struct ili9805_desc tm041xdhg01_desc = {
.init = tm041xdhg01_init,
- .init_length = ARRAY_SIZE(tm041xdhg01_init),
.mode = &tm041xdhg01_timing,
.width_mm = 42,
.height_mm = 96,
--
2.43.0
