drm/panel: ilitek-ili9881c: support Waveshare 7.0" DSI panel

Enable support for Waveshare 7.0" DSI TOUCH-A panel. It requires
additional voltage regulator, iovcc.

Reviewed-by: Linus Walleij <linusw@kernel.org>
Link: https://patch.msgid.link/20260418-waveshare-dsi-touch-v4-2-b249f3e702bd@oss.qualcomm.com
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>

diff --git a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
index 947b47841b010c8e3b47e919417ef08d59295c19..0652cdb57d1129a20190e459fd03b2430274fdcc 100644 (file)
--- a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
+++ b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
@@ -52,6 +52,7 @@ struct ili9881c {
        const struct ili9881c_desc      *desc;
 
        struct regulator        *power;
+       struct regulator        *iovcc;
        struct gpio_desc        *reset;
 
        enum drm_panel_orientation      orientation;
@@ -1997,6 +1998,205 @@ static const struct ili9881c_instr bsd1218_a101kl68_init[] = {
        ILI9881C_COMMAND_INSTR(0xd3, 0x3f),
 };
 
+static const struct ili9881c_instr waveshare_7inch_a_init[] = {
+       ILI9881C_SWITCH_PAGE_INSTR(3),
+       ILI9881C_COMMAND_INSTR(0x01, 0x00),
+       ILI9881C_COMMAND_INSTR(0x02, 0x00),
+       ILI9881C_COMMAND_INSTR(0x03, 0x73),
+       ILI9881C_COMMAND_INSTR(0x04, 0x00),
+       ILI9881C_COMMAND_INSTR(0x05, 0x00),
+       ILI9881C_COMMAND_INSTR(0x06, 0x0a),
+       ILI9881C_COMMAND_INSTR(0x07, 0x00),
+       ILI9881C_COMMAND_INSTR(0x08, 0x00),
+       ILI9881C_COMMAND_INSTR(0x09, 0x61),
+       ILI9881C_COMMAND_INSTR(0x0a, 0x00),
+       ILI9881C_COMMAND_INSTR(0x0b, 0x00),
+       ILI9881C_COMMAND_INSTR(0x0c, 0x01),
+       ILI9881C_COMMAND_INSTR(0x0d, 0x00),
+       ILI9881C_COMMAND_INSTR(0x0e, 0x00),
+       ILI9881C_COMMAND_INSTR(0x0f, 0x61),
+       ILI9881C_COMMAND_INSTR(0x10, 0x61),
+       ILI9881C_COMMAND_INSTR(0x11, 0x00),
+       ILI9881C_COMMAND_INSTR(0x12, 0x00),
+       ILI9881C_COMMAND_INSTR(0x13, 0x00),
+       ILI9881C_COMMAND_INSTR(0x14, 0x00),
+       ILI9881C_COMMAND_INSTR(0x15, 0x00),
+       ILI9881C_COMMAND_INSTR(0x16, 0x00),
+       ILI9881C_COMMAND_INSTR(0x17, 0x00),
+       ILI9881C_COMMAND_INSTR(0x18, 0x00),
+       ILI9881C_COMMAND_INSTR(0x19, 0x00),
+       ILI9881C_COMMAND_INSTR(0x1a, 0x00),
+       ILI9881C_COMMAND_INSTR(0x1b, 0x00),
+       ILI9881C_COMMAND_INSTR(0x1c, 0x00),
+       ILI9881C_COMMAND_INSTR(0x1d, 0x00),
+       ILI9881C_COMMAND_INSTR(0x1e, 0x40),
+       ILI9881C_COMMAND_INSTR(0x1f, 0x80),
+       ILI9881C_COMMAND_INSTR(0x20, 0x06),
+       ILI9881C_COMMAND_INSTR(0x21, 0x01),
+       ILI9881C_COMMAND_INSTR(0x22, 0x00),
+       ILI9881C_COMMAND_INSTR(0x23, 0x00),
+       ILI9881C_COMMAND_INSTR(0x24, 0x00),
+       ILI9881C_COMMAND_INSTR(0x25, 0x00),
+       ILI9881C_COMMAND_INSTR(0x26, 0x00),
+       ILI9881C_COMMAND_INSTR(0x27, 0x00),
+       ILI9881C_COMMAND_INSTR(0x28, 0x33),
+       ILI9881C_COMMAND_INSTR(0x29, 0x03),
+       ILI9881C_COMMAND_INSTR(0x2a, 0x00),
+       ILI9881C_COMMAND_INSTR(0x2b, 0x00),
+       ILI9881C_COMMAND_INSTR(0x2c, 0x00),
+       ILI9881C_COMMAND_INSTR(0x2d, 0x00),
+       ILI9881C_COMMAND_INSTR(0x2e, 0x00),
+       ILI9881C_COMMAND_INSTR(0x2f, 0x00),
+       ILI9881C_COMMAND_INSTR(0x30, 0x00),
+       ILI9881C_COMMAND_INSTR(0x31, 0x00),
+       ILI9881C_COMMAND_INSTR(0x32, 0x00),
+       ILI9881C_COMMAND_INSTR(0x33, 0x00),
+       ILI9881C_COMMAND_INSTR(0x34, 0x04),
+       ILI9881C_COMMAND_INSTR(0x35, 0x00),
+       ILI9881C_COMMAND_INSTR(0x36, 0x00),
+       ILI9881C_COMMAND_INSTR(0x37, 0x00),
+       ILI9881C_COMMAND_INSTR(0x38, 0x3c),
+       ILI9881C_COMMAND_INSTR(0x39, 0x00),
+       ILI9881C_COMMAND_INSTR(0x3a, 0x00),
+       ILI9881C_COMMAND_INSTR(0x3b, 0x00),
+       ILI9881C_COMMAND_INSTR(0x3c, 0x00),
+       ILI9881C_COMMAND_INSTR(0x3d, 0x00),
+       ILI9881C_COMMAND_INSTR(0x3e, 0x00),
+       ILI9881C_COMMAND_INSTR(0x3f, 0x00),
+       ILI9881C_COMMAND_INSTR(0x40, 0x00),
+       ILI9881C_COMMAND_INSTR(0x41, 0x00),
+       ILI9881C_COMMAND_INSTR(0x42, 0x00),
+       ILI9881C_COMMAND_INSTR(0x43, 0x00),
+       ILI9881C_COMMAND_INSTR(0x44, 0x00),
+       ILI9881C_COMMAND_INSTR(0x50, 0x10),
+       ILI9881C_COMMAND_INSTR(0x51, 0x32),
+       ILI9881C_COMMAND_INSTR(0x52, 0x54),
+       ILI9881C_COMMAND_INSTR(0x53, 0x76),
+       ILI9881C_COMMAND_INSTR(0x54, 0x98),
+       ILI9881C_COMMAND_INSTR(0x55, 0xba),
+       ILI9881C_COMMAND_INSTR(0x56, 0x10),
+       ILI9881C_COMMAND_INSTR(0x57, 0x32),
+       ILI9881C_COMMAND_INSTR(0x58, 0x54),
+       ILI9881C_COMMAND_INSTR(0x59, 0x76),
+       ILI9881C_COMMAND_INSTR(0x5a, 0x98),
+       ILI9881C_COMMAND_INSTR(0x5b, 0xba),
+       ILI9881C_COMMAND_INSTR(0x5c, 0xdc),
+       ILI9881C_COMMAND_INSTR(0x5d, 0xfe),
+       ILI9881C_COMMAND_INSTR(0x5e, 0x00),
+       ILI9881C_COMMAND_INSTR(0x5f, 0x0e),
+       ILI9881C_COMMAND_INSTR(0x60, 0x0f),
+       ILI9881C_COMMAND_INSTR(0x61, 0x0c),
+       ILI9881C_COMMAND_INSTR(0x62, 0x0d),
+       ILI9881C_COMMAND_INSTR(0x63, 0x06),
+       ILI9881C_COMMAND_INSTR(0x64, 0x07),
+       ILI9881C_COMMAND_INSTR(0x65, 0x02),
+       ILI9881C_COMMAND_INSTR(0x66, 0x02),
+       ILI9881C_COMMAND_INSTR(0x67, 0x02),
+       ILI9881C_COMMAND_INSTR(0x68, 0x02),
+       ILI9881C_COMMAND_INSTR(0x69, 0x01),
+       ILI9881C_COMMAND_INSTR(0x6a, 0x00),
+       ILI9881C_COMMAND_INSTR(0x6b, 0x02),
+       ILI9881C_COMMAND_INSTR(0x6c, 0x15),
+       ILI9881C_COMMAND_INSTR(0x6d, 0x14),
+       ILI9881C_COMMAND_INSTR(0x6e, 0x02),
+       ILI9881C_COMMAND_INSTR(0x6f, 0x02),
+       ILI9881C_COMMAND_INSTR(0x70, 0x02),
+       ILI9881C_COMMAND_INSTR(0x71, 0x02),
+       ILI9881C_COMMAND_INSTR(0x72, 0x02),
+       ILI9881C_COMMAND_INSTR(0x73, 0x02),
+       ILI9881C_COMMAND_INSTR(0x74, 0x02),
+       ILI9881C_COMMAND_INSTR(0x75, 0x0e),
+       ILI9881C_COMMAND_INSTR(0x76, 0x0f),
+       ILI9881C_COMMAND_INSTR(0x77, 0x0c),
+       ILI9881C_COMMAND_INSTR(0x78, 0x0d),
+       ILI9881C_COMMAND_INSTR(0x79, 0x06),
+       ILI9881C_COMMAND_INSTR(0x7a, 0x07),
+       ILI9881C_COMMAND_INSTR(0x7b, 0x02),
+       ILI9881C_COMMAND_INSTR(0x7c, 0x02),
+       ILI9881C_COMMAND_INSTR(0x7d, 0x02),
+       ILI9881C_COMMAND_INSTR(0x7e, 0x02),
+       ILI9881C_COMMAND_INSTR(0x7f, 0x01),
+       ILI9881C_COMMAND_INSTR(0x80, 0x00),
+       ILI9881C_COMMAND_INSTR(0x81, 0x02),
+       ILI9881C_COMMAND_INSTR(0x82, 0x14),
+       ILI9881C_COMMAND_INSTR(0x83, 0x15),
+       ILI9881C_COMMAND_INSTR(0x84, 0x02),
+       ILI9881C_COMMAND_INSTR(0x85, 0x02),
+       ILI9881C_COMMAND_INSTR(0x86, 0x02),
+       ILI9881C_COMMAND_INSTR(0x87, 0x02),
+       ILI9881C_COMMAND_INSTR(0x88, 0x02),
+       ILI9881C_COMMAND_INSTR(0x89, 0x02),
+       ILI9881C_COMMAND_INSTR(0x8a, 0x02),
+
+       ILI9881C_SWITCH_PAGE_INSTR(4),
+       ILI9881C_COMMAND_INSTR(0x38, 0x01),
+       ILI9881C_COMMAND_INSTR(0x39, 0x00),
+       ILI9881C_COMMAND_INSTR(0x6c, 0x15),
+       ILI9881C_COMMAND_INSTR(0x6e, 0x2a),
+       ILI9881C_COMMAND_INSTR(0x6f, 0x33),
+       ILI9881C_COMMAND_INSTR(0x3a, 0x94),
+       ILI9881C_COMMAND_INSTR(0x8d, 0x14),
+       ILI9881C_COMMAND_INSTR(0x87, 0xba),
+       ILI9881C_COMMAND_INSTR(0x26, 0x76),
+       ILI9881C_COMMAND_INSTR(0xb2, 0xd1),
+       ILI9881C_COMMAND_INSTR(0xb5, 0x06),
+       ILI9881C_COMMAND_INSTR(0x3b, 0x98),
+
+       ILI9881C_SWITCH_PAGE_INSTR(1),
+       ILI9881C_COMMAND_INSTR(0x22, 0x0a),
+       ILI9881C_COMMAND_INSTR(0x31, 0x00),
+       ILI9881C_COMMAND_INSTR(0x53, 0x71),
+       ILI9881C_COMMAND_INSTR(0x55, 0x8f),
+       ILI9881C_COMMAND_INSTR(0x40, 0x33),
+       ILI9881C_COMMAND_INSTR(0x50, 0x96),
+       ILI9881C_COMMAND_INSTR(0x51, 0x96),
+       ILI9881C_COMMAND_INSTR(0x60, 0x23),
+       ILI9881C_COMMAND_INSTR(0xa0, 0x08),
+       ILI9881C_COMMAND_INSTR(0xa1, 0x1d),
+       ILI9881C_COMMAND_INSTR(0xa2, 0x2a),
+       ILI9881C_COMMAND_INSTR(0xa3, 0x10),
+       ILI9881C_COMMAND_INSTR(0xa4, 0x15),
+       ILI9881C_COMMAND_INSTR(0xa5, 0x28),
+       ILI9881C_COMMAND_INSTR(0xa6, 0x1c),
+       ILI9881C_COMMAND_INSTR(0xa7, 0x1d),
+       ILI9881C_COMMAND_INSTR(0xa8, 0x7e),
+       ILI9881C_COMMAND_INSTR(0xa9, 0x1d),
+       ILI9881C_COMMAND_INSTR(0xaa, 0x29),
+       ILI9881C_COMMAND_INSTR(0xab, 0x6b),
+       ILI9881C_COMMAND_INSTR(0xac, 0x1a),
+       ILI9881C_COMMAND_INSTR(0xad, 0x18),
+       ILI9881C_COMMAND_INSTR(0xae, 0x4b),
+       ILI9881C_COMMAND_INSTR(0xaf, 0x20),
+       ILI9881C_COMMAND_INSTR(0xb0, 0x27),
+       ILI9881C_COMMAND_INSTR(0xb1, 0x50),
+       ILI9881C_COMMAND_INSTR(0xb2, 0x64),
+       ILI9881C_COMMAND_INSTR(0xb3, 0x39),
+       ILI9881C_COMMAND_INSTR(0xc0, 0x08),
+       ILI9881C_COMMAND_INSTR(0xc1, 0x1d),
+       ILI9881C_COMMAND_INSTR(0xc2, 0x2a),
+       ILI9881C_COMMAND_INSTR(0xc3, 0x10),
+       ILI9881C_COMMAND_INSTR(0xc4, 0x15),
+       ILI9881C_COMMAND_INSTR(0xc5, 0x28),
+       ILI9881C_COMMAND_INSTR(0xc6, 0x1c),
+       ILI9881C_COMMAND_INSTR(0xc7, 0x1d),
+       ILI9881C_COMMAND_INSTR(0xc8, 0x7e),
+       ILI9881C_COMMAND_INSTR(0xc9, 0x1d),
+       ILI9881C_COMMAND_INSTR(0xca, 0x29),
+       ILI9881C_COMMAND_INSTR(0xcb, 0x6b),
+       ILI9881C_COMMAND_INSTR(0xcc, 0x1a),
+       ILI9881C_COMMAND_INSTR(0xcd, 0x18),
+       ILI9881C_COMMAND_INSTR(0xce, 0x4b),
+       ILI9881C_COMMAND_INSTR(0xcf, 0x20),
+       ILI9881C_COMMAND_INSTR(0xd0, 0x27),
+       ILI9881C_COMMAND_INSTR(0xd1, 0x50),
+       ILI9881C_COMMAND_INSTR(0xd2, 0x64),
+       ILI9881C_COMMAND_INSTR(0xd3, 0x39),
+
+       ILI9881C_SWITCH_PAGE_INSTR(0),
+       ILI9881C_COMMAND_INSTR(0x3a, 0x77),
+       ILI9881C_COMMAND_INSTR(0x36, 0x00),
+};
+
 static inline struct ili9881c *panel_to_ili9881c(struct drm_panel *panel)
 {
        return container_of(panel, struct ili9881c, panel);
@@ -2035,9 +2235,19 @@ static int ili9881c_prepare(struct drm_panel *panel)
        int ret;
 
        /* Power the panel */
+       if (ctx->iovcc) {
+               ret = regulator_enable(ctx->iovcc);
+               if (ret)
+                       return ret;
+       }
+
+       msleep(5);
        ret = regulator_enable(ctx->power);
-       if (ret)
-               return ret;
+       if (ret) {
+               mctx.accum_err = ret;
+               goto disable_iovcc;
+       }
+
        msleep(5);
 
        /* And reset it */
@@ -2074,6 +2284,9 @@ static int ili9881c_prepare(struct drm_panel *panel)
 
 disable_power:
        regulator_disable(ctx->power);
+disable_iovcc:
+       if (ctx->iovcc)
+               regulator_disable(ctx->iovcc);
        return mctx.accum_err;
 }
 
@@ -2085,6 +2298,8 @@ static int ili9881c_unprepare(struct drm_panel *panel)
        mipi_dsi_dcs_set_display_off_multi(&mctx);
        mipi_dsi_dcs_enter_sleep_mode_multi(&mctx);
        regulator_disable(ctx->power);
+       if (ctx->iovcc)
+               regulator_disable(ctx->iovcc);
        gpiod_set_value_cansleep(ctx->reset, 1);
 
        return 0;
@@ -2260,6 +2475,23 @@ static const struct drm_display_mode bsd1218_a101kl68_default_mode = {
        .height_mm      = 170,
 };
 
+static const struct drm_display_mode waveshare_7inch_a_mode = {
+       .clock          = 83333,
+
+       .hdisplay       = 720,
+       .hsync_start    = 720 + 120,
+       .hsync_end      = 720 + 120 + 100,
+       .htotal         = 720 + 120 + 100 + 100,
+
+       .vdisplay       = 1280,
+       .vsync_start    = 1280 + 10,
+       .vsync_end      = 1280 + 10 + 10,
+       .vtotal         = 1280 + 10 + 10 + 10,
+
+       .width_mm       = 85,
+       .height_mm      = 154,
+};
+
 static int ili9881c_get_modes(struct drm_panel *panel,
                              struct drm_connector *connector)
 {
@@ -2329,6 +2561,11 @@ static int ili9881c_dsi_probe(struct mipi_dsi_device *dsi)
                return dev_err_probe(&dsi->dev, PTR_ERR(ctx->power),
                                     "Couldn't get our power regulator\n");
 
+       ctx->iovcc = devm_regulator_get_optional(&dsi->dev, "iovcc");
+       if (IS_ERR(ctx->iovcc))
+               return dev_err_probe(&dsi->dev, PTR_ERR(ctx->iovcc),
+                                    "Couldn't get our iovcc regulator\n");
+
        ctx->reset = devm_gpiod_get_optional(&dsi->dev, "reset", GPIOD_OUT_LOW);
        if (IS_ERR(ctx->reset))
                return dev_err_probe(&dsi->dev, PTR_ERR(ctx->reset),
@@ -2454,6 +2691,15 @@ static const struct ili9881c_desc bsd1218_a101kl68_desc = {
        .lanes = 4,
 };
 
+static const struct ili9881c_desc waveshare_7inch_a_desc = {
+       .init = waveshare_7inch_a_init,
+       .init_length = ARRAY_SIZE(waveshare_7inch_a_init),
+       .mode = &waveshare_7inch_a_mode,
+       .mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_HSE |
+                     MIPI_DSI_MODE_LPM | MIPI_DSI_CLOCK_NON_CONTINUOUS,
+       .lanes = 2,
+};
+
 static const struct of_device_id ili9881c_of_match[] = {
        { .compatible = "bananapi,lhr050h41", .data = &lhr050h41_desc },
        { .compatible = "bestar,bsd1218-a101kl68", .data = &bsd1218_a101kl68_desc },
@@ -2462,6 +2708,7 @@ static const struct of_device_id ili9881c_of_match[] = {
        { .compatible = "tdo,tl050hdv35", .data = &tl050hdv35_desc },
        { .compatible = "wanchanglong,w552946aaa", .data = &w552946aaa_desc },
        { .compatible = "wanchanglong,w552946aba", .data = &w552946aba_desc },
+       { .compatible = "waveshare,7.0-dsi-touch-a", .data = &waveshare_7inch_a_desc },
        { .compatible = "ampire,am8001280g", .data = &am8001280g_desc },
        { .compatible = "raspberrypi,dsi-5inch", &rpi_5inch_desc },
        { .compatible = "raspberrypi,dsi-7inch", &rpi_7inch_desc },