On Mon, Feb 07, 2022 at 11:16:18PM +0100, Ahmad Fatoum wrote: > Readd common code... > > Signed-off-by: Ahmad Fatoum <ahmad@xxxxxx> > --- > Threw out the baby with the bath water in the rebase.. > --- > commands/mipi_dbi.c | 104 ++++++++++++++++++++++++ > include/video/mipi_dbi.h | 105 ++++++++++++++++++++++++ > include/video/mipi_display.h | 150 +++++++++++++++++++++++++++++++++++ > 3 files changed, 359 insertions(+) > create mode 100644 commands/mipi_dbi.c > create mode 100644 include/video/mipi_dbi.h > create mode 100644 include/video/mipi_display.h Applied, thanks Sascha > > diff --git a/commands/mipi_dbi.c b/commands/mipi_dbi.c > new file mode 100644 > index 000000000000..b9b665b72151 > --- /dev/null > +++ b/commands/mipi_dbi.c > @@ -0,0 +1,104 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +// SPDX-FileCopyrightText: © 2022 Ahmad Fatoum > + > +#include <common.h> > +#include <command.h> > +#include <getopt.h> > +#include <video/mipi_dbi.h> > +#include <video/mipi_display.h> > + > +static int mipi_dbi_command_show(struct mipi_dbi *dbi, int cmd) > +{ > + u8 val[4]; > + int ret; > + size_t len; > + > + if (!mipi_dbi_command_is_read(dbi, cmd)) > + return -EACCES; > + > + len = mipi_dbi_command_read_len(cmd); > + > + printf("%02x: ", cmd); > + ret = mipi_dbi_command_buf(dbi, cmd, val, len); > + if (ret) { > + printf("XX\n"); > + return ret; > + } > + printf("%*phN\n", (int)len, val); > + > + return 0; > +} > + > +static int do_mipi_dbi(int argc, char *argv[]) > +{ > + struct mipi_dbi *dbi; > + int opt, ret, i; > + bool write = false; > + u8 cmd, val[4]; > + > + dbi = list_first_entry_or_null(&mipi_dbi_list, struct mipi_dbi, list); > + > + while ((opt = getopt(argc, argv, "wld:")) > 0) { > + struct mipi_dbi *tmp; > + > + switch (opt) { > + case 'w': > + write = true; > + break; > + case 'l': > + list_for_each_entry(tmp, &mipi_dbi_list, list) > + printf("%s\n", mipi_dbi_name(tmp)); > + return 0; > + case 'd': > + dbi = NULL; > + list_for_each_entry(tmp, &mipi_dbi_list, list) { > + if (!strcmp(optarg, mipi_dbi_name(tmp))) { > + dbi = tmp; > + break; > + } > + } > + break; > + default: > + return COMMAND_ERROR_USAGE; > + } > + } > + > + if (!dbi) > + return -ENODEV; > + > + if (optind == argc) { > + for (cmd = 0; cmd < 255; cmd++) > + mipi_dbi_command_show(dbi, cmd); > + return 0; > + } > + > + ret = kstrtou8(argv[optind++], 16, &cmd); > + if (ret < 0) > + return ret; > + > + if (optind == argc && !write) > + return mipi_dbi_command_show(dbi, cmd); > + > + for (i = optind; i < argc; i++) { > + ret = kstrtou8(argv[optind + i], 16, &val[i]); > + if (ret < 0) > + return ret; > + } > + > + return mipi_dbi_command_buf(dbi, cmd, val, argc - optind); > +} > + > +BAREBOX_CMD_HELP_START(mipi_dbi) > +BAREBOX_CMD_HELP_TEXT("Options:") > +BAREBOX_CMD_HELP_OPT ("-l\t", "list all MIPI DBI devices") > +BAREBOX_CMD_HELP_OPT ("-d DEVICE", "select specific device (default is first registered)") > +BAREBOX_CMD_HELP_OPT ("-w", "issue write command") > +BAREBOX_CMD_HELP_END > + > +BAREBOX_CMD_START(mipi_dbi) > + .cmd = do_mipi_dbi, > + BAREBOX_CMD_DESC("write/read from MIPI DBI SPI device") > + BAREBOX_CMD_OPTS("[-wld] [REG] [DATA...]") > + BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP) > + BAREBOX_CMD_HELP(cmd_mipi_dbi_help) > +BAREBOX_CMD_END > diff --git a/include/video/mipi_dbi.h b/include/video/mipi_dbi.h > new file mode 100644 > index 000000000000..92fdc500d1ba > --- /dev/null > +++ b/include/video/mipi_dbi.h > @@ -0,0 +1,105 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > +/* > + * MIPI Display Bus Interface (DBI) LCD controller support > + * > + * Copyright 2016 Noralf Trønnes > + */ > + > +#ifndef __LINUX_MIPI_DBI_H > +#define __LINUX_MIPI_DBI_H > + > +#include <linux/types.h> > +#include <spi/spi.h> > +#include <driver.h> > + > +struct regulator; > +struct fb_videomode; > + > +/** > + * struct mipi_dbi - MIPI DBI interface > + */ > +struct mipi_dbi { > + /** > + * @command: Bus specific callback executing commands. > + */ > + int (*command)(struct mipi_dbi *dbi, u8 *cmd, u8 *param, size_t num); > + > + /** > + * @read_commands: Array of read commands terminated by a zero entry. > + * Reading is disabled if this is NULL. > + */ > + const u8 *read_commands; > + > + /** > + * @swap_bytes: Swap bytes in buffer before transfer > + */ > + bool swap_bytes; > + > + /** > + * @reset: Optional reset gpio > + */ > + int reset; > + > + /* Type C specific */ > + > + /** > + * @spi: SPI device > + */ > + struct spi_device *spi; > + > + /** > + * @dc: Optional D/C gpio. > + */ > + int dc; > + > + struct list_head list; > +}; > + > +static inline const char *mipi_dbi_name(struct mipi_dbi *dbi) > +{ > + return dev_name(&dbi->spi->dev); > +} > + > +int mipi_dbi_spi_init(struct spi_device *spi, struct mipi_dbi *dbi, > + int dc); > +void mipi_dbi_hw_reset(struct mipi_dbi *dbi); > +bool mipi_dbi_display_is_on(struct mipi_dbi *dbi); > + > +u32 mipi_dbi_spi_cmd_max_speed(struct spi_device *spi, size_t len); > +int mipi_dbi_spi_transfer(struct spi_device *spi, u32 speed_hz, > + u8 bpw, const void *buf, size_t len); > + > +int mipi_dbi_command_read(struct mipi_dbi *dbi, u8 cmd, u8 *val); > +int mipi_dbi_command_buf(struct mipi_dbi *dbi, u8 cmd, u8 *data, size_t len); > +int mipi_dbi_command_stackbuf(struct mipi_dbi *dbi, u8 cmd, const u8 *data, > + size_t len); > + > +/** > + * mipi_dbi_command - MIPI DCS command with optional parameter(s) > + * @dbi: MIPI DBI structure > + * @cmd: Command > + * @seq: Optional parameter(s) > + * > + * Send MIPI DCS command to the controller. Use mipi_dbi_command_read() for > + * get/read. > + * > + * Returns: > + * Zero on success, negative error code on failure. > + */ > +#define mipi_dbi_command(dbi, cmd, seq...) \ > +({ \ > + const u8 d[] = { seq }; \ > + struct device_d *dev = &(dbi)->spi->dev; \ > + int ret; \ > + ret = mipi_dbi_command_stackbuf(dbi, cmd, d, ARRAY_SIZE(d)); \ > + if (ret) \ > + dev_err(dev, "error %pe when sending command %#02x\n", ERR_PTR(ret), cmd); \ > + ret; \ > +}) > + > +bool mipi_dbi_command_is_read(struct mipi_dbi *dbi, u8 cmd); > +int mipi_dbi_command_read_len(int cmd); > + > +extern struct list_head mipi_dbi_list; > + > +#endif /* __LINUX_MIPI_DBI_H */ > diff --git a/include/video/mipi_display.h b/include/video/mipi_display.h > new file mode 100644 > index 000000000000..b6d8b874233f > --- /dev/null > +++ b/include/video/mipi_display.h > @@ -0,0 +1,150 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > +/* > + * Defines for Mobile Industry Processor Interface (MIPI(R)) > + * Display Working Group standards: DSI, DCS, DBI, DPI > + * > + * Copyright (C) 2010 Guennadi Liakhovetski <g.liakhovetski@xxxxxx> > + * Copyright (C) 2006 Nokia Corporation > + * Author: Imre Deak <imre.deak@xxxxxxxxx> > + */ > +#ifndef MIPI_DISPLAY_H > +#define MIPI_DISPLAY_H > + > +/* MIPI DSI Processor-to-Peripheral transaction types */ > +enum { > + MIPI_DSI_V_SYNC_START = 0x01, > + MIPI_DSI_V_SYNC_END = 0x11, > + MIPI_DSI_H_SYNC_START = 0x21, > + MIPI_DSI_H_SYNC_END = 0x31, > + > + MIPI_DSI_COMPRESSION_MODE = 0x07, > + MIPI_DSI_END_OF_TRANSMISSION = 0x08, > + > + MIPI_DSI_COLOR_MODE_OFF = 0x02, > + MIPI_DSI_COLOR_MODE_ON = 0x12, > + MIPI_DSI_SHUTDOWN_PERIPHERAL = 0x22, > + MIPI_DSI_TURN_ON_PERIPHERAL = 0x32, > + > + MIPI_DSI_GENERIC_SHORT_WRITE_0_PARAM = 0x03, > + MIPI_DSI_GENERIC_SHORT_WRITE_1_PARAM = 0x13, > + MIPI_DSI_GENERIC_SHORT_WRITE_2_PARAM = 0x23, > + > + MIPI_DSI_GENERIC_READ_REQUEST_0_PARAM = 0x04, > + MIPI_DSI_GENERIC_READ_REQUEST_1_PARAM = 0x14, > + MIPI_DSI_GENERIC_READ_REQUEST_2_PARAM = 0x24, > + > + MIPI_DSI_DCS_SHORT_WRITE = 0x05, > + MIPI_DSI_DCS_SHORT_WRITE_PARAM = 0x15, > + > + MIPI_DSI_DCS_READ = 0x06, > + MIPI_DSI_EXECUTE_QUEUE = 0x16, > + > + MIPI_DSI_SET_MAXIMUM_RETURN_PACKET_SIZE = 0x37, > + > + MIPI_DSI_NULL_PACKET = 0x09, > + MIPI_DSI_BLANKING_PACKET = 0x19, > + MIPI_DSI_GENERIC_LONG_WRITE = 0x29, > + MIPI_DSI_DCS_LONG_WRITE = 0x39, > + > + MIPI_DSI_PICTURE_PARAMETER_SET = 0x0a, > + MIPI_DSI_COMPRESSED_PIXEL_STREAM = 0x0b, > + > + MIPI_DSI_LOOSELY_PACKED_PIXEL_STREAM_YCBCR20 = 0x0c, > + MIPI_DSI_PACKED_PIXEL_STREAM_YCBCR24 = 0x1c, > + MIPI_DSI_PACKED_PIXEL_STREAM_YCBCR16 = 0x2c, > + > + MIPI_DSI_PACKED_PIXEL_STREAM_30 = 0x0d, > + MIPI_DSI_PACKED_PIXEL_STREAM_36 = 0x1d, > + MIPI_DSI_PACKED_PIXEL_STREAM_YCBCR12 = 0x3d, > + > + MIPI_DSI_PACKED_PIXEL_STREAM_16 = 0x0e, > + MIPI_DSI_PACKED_PIXEL_STREAM_18 = 0x1e, > + MIPI_DSI_PIXEL_STREAM_3BYTE_18 = 0x2e, > + MIPI_DSI_PACKED_PIXEL_STREAM_24 = 0x3e, > +}; > + > +/* MIPI DSI Peripheral-to-Processor transaction types */ > +enum { > + MIPI_DSI_RX_ACKNOWLEDGE_AND_ERROR_REPORT = 0x02, > + MIPI_DSI_RX_END_OF_TRANSMISSION = 0x08, > + MIPI_DSI_RX_GENERIC_SHORT_READ_RESPONSE_1BYTE = 0x11, > + MIPI_DSI_RX_GENERIC_SHORT_READ_RESPONSE_2BYTE = 0x12, > + MIPI_DSI_RX_GENERIC_LONG_READ_RESPONSE = 0x1a, > + MIPI_DSI_RX_DCS_LONG_READ_RESPONSE = 0x1c, > + MIPI_DSI_RX_DCS_SHORT_READ_RESPONSE_1BYTE = 0x21, > + MIPI_DSI_RX_DCS_SHORT_READ_RESPONSE_2BYTE = 0x22, > +}; > + > +/* MIPI DCS commands */ > +enum { > + MIPI_DCS_NOP = 0x00, > + MIPI_DCS_SOFT_RESET = 0x01, > + MIPI_DCS_GET_COMPRESSION_MODE = 0x03, > + MIPI_DCS_GET_DISPLAY_ID = 0x04, > + MIPI_DCS_GET_ERROR_COUNT_ON_DSI = 0x05, > + MIPI_DCS_GET_RED_CHANNEL = 0x06, > + MIPI_DCS_GET_GREEN_CHANNEL = 0x07, > + MIPI_DCS_GET_BLUE_CHANNEL = 0x08, > + MIPI_DCS_GET_DISPLAY_STATUS = 0x09, > + MIPI_DCS_GET_POWER_MODE = 0x0A, > + MIPI_DCS_GET_ADDRESS_MODE = 0x0B, > + MIPI_DCS_GET_PIXEL_FORMAT = 0x0C, > + MIPI_DCS_GET_DISPLAY_MODE = 0x0D, > + MIPI_DCS_GET_SIGNAL_MODE = 0x0E, > + MIPI_DCS_GET_DIAGNOSTIC_RESULT = 0x0F, > + MIPI_DCS_ENTER_SLEEP_MODE = 0x10, > + MIPI_DCS_EXIT_SLEEP_MODE = 0x11, > + MIPI_DCS_ENTER_PARTIAL_MODE = 0x12, > + MIPI_DCS_ENTER_NORMAL_MODE = 0x13, > + MIPI_DCS_GET_IMAGE_CHECKSUM_RGB = 0x14, > + MIPI_DCS_GET_IMAGE_CHECKSUM_CT = 0x15, > + MIPI_DCS_EXIT_INVERT_MODE = 0x20, > + MIPI_DCS_ENTER_INVERT_MODE = 0x21, > + MIPI_DCS_SET_GAMMA_CURVE = 0x26, > + MIPI_DCS_SET_DISPLAY_OFF = 0x28, > + MIPI_DCS_SET_DISPLAY_ON = 0x29, > + MIPI_DCS_SET_COLUMN_ADDRESS = 0x2A, > + MIPI_DCS_SET_PAGE_ADDRESS = 0x2B, > + MIPI_DCS_WRITE_MEMORY_START = 0x2C, > + MIPI_DCS_WRITE_LUT = 0x2D, > + MIPI_DCS_READ_MEMORY_START = 0x2E, > + MIPI_DCS_SET_PARTIAL_ROWS = 0x30, /* MIPI DCS 1.02 - MIPI_DCS_SET_PARTIAL_AREA before that */ > + MIPI_DCS_SET_PARTIAL_COLUMNS = 0x31, > + MIPI_DCS_SET_SCROLL_AREA = 0x33, > + MIPI_DCS_SET_TEAR_OFF = 0x34, > + MIPI_DCS_SET_TEAR_ON = 0x35, > + MIPI_DCS_SET_ADDRESS_MODE = 0x36, > + MIPI_DCS_SET_SCROLL_START = 0x37, > + MIPI_DCS_EXIT_IDLE_MODE = 0x38, > + MIPI_DCS_ENTER_IDLE_MODE = 0x39, > + MIPI_DCS_SET_PIXEL_FORMAT = 0x3A, > + MIPI_DCS_WRITE_MEMORY_CONTINUE = 0x3C, > + MIPI_DCS_SET_3D_CONTROL = 0x3D, > + MIPI_DCS_READ_MEMORY_CONTINUE = 0x3E, > + MIPI_DCS_GET_3D_CONTROL = 0x3F, > + MIPI_DCS_SET_VSYNC_TIMING = 0x40, > + MIPI_DCS_SET_TEAR_SCANLINE = 0x44, > + MIPI_DCS_GET_SCANLINE = 0x45, > + MIPI_DCS_SET_DISPLAY_BRIGHTNESS = 0x51, /* MIPI DCS 1.3 */ > + MIPI_DCS_GET_DISPLAY_BRIGHTNESS = 0x52, /* MIPI DCS 1.3 */ > + MIPI_DCS_WRITE_CONTROL_DISPLAY = 0x53, /* MIPI DCS 1.3 */ > + MIPI_DCS_GET_CONTROL_DISPLAY = 0x54, /* MIPI DCS 1.3 */ > + MIPI_DCS_WRITE_POWER_SAVE = 0x55, /* MIPI DCS 1.3 */ > + MIPI_DCS_GET_POWER_SAVE = 0x56, /* MIPI DCS 1.3 */ > + MIPI_DCS_SET_CABC_MIN_BRIGHTNESS = 0x5E, /* MIPI DCS 1.3 */ > + MIPI_DCS_GET_CABC_MIN_BRIGHTNESS = 0x5F, /* MIPI DCS 1.3 */ > + MIPI_DCS_READ_DDB_START = 0xA1, > + MIPI_DCS_READ_PPS_START = 0xA2, > + MIPI_DCS_READ_DDB_CONTINUE = 0xA8, > + MIPI_DCS_READ_PPS_CONTINUE = 0xA9, > +}; > + > +/* MIPI DCS pixel formats */ > +#define MIPI_DCS_PIXEL_FMT_24BIT 7 > +#define MIPI_DCS_PIXEL_FMT_18BIT 6 > +#define MIPI_DCS_PIXEL_FMT_16BIT 5 > +#define MIPI_DCS_PIXEL_FMT_12BIT 3 > +#define MIPI_DCS_PIXEL_FMT_8BIT 2 > +#define MIPI_DCS_PIXEL_FMT_3BIT 1 > + > +#endif > -- > 2.34.1 > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox