Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,13 @@ struct ili9881c_instr {
} arg;
};

enum ili9881_desc_flags {
ILI9881_FLAGS_NO_SHUTDOWN_CMDS = BIT(0),
ILI9881_FLAGS_PANEL_ON_IN_PREPARE = BIT(1),
ILI9881_FLAGS_MAX = BIT(31),
};

struct ili9881c_desc {
const struct ili9881c_instr *init;
const size_t init_length;
const struct drm_display_mode *mode;
const unsigned long mode_flags;
u8 default_address_mode;
unsigned int lanes;
enum ili9881_desc_flags flags;
};

struct ili9881c {
Expand Down Expand Up @@ -2310,12 +2303,6 @@ static int ili9881c_prepare(struct drm_panel *panel)
if (mctx.accum_err)
goto disable_power;

if (ctx->desc->flags & ILI9881_FLAGS_PANEL_ON_IN_PREPARE) {
msleep(120);

ret = mipi_dsi_dcs_set_display_on(ctx->dsi);
}

return 0;

disable_power:
Expand Down Expand Up @@ -2588,7 +2575,6 @@ static int ili9881c_dsi_probe(struct mipi_dsi_device *dsi)
ctx->dsi = dsi;
ctx->desc = of_device_get_match_data(&dsi->dev);

ctx->panel.prepare_prev_first = true;
ctx->power = devm_regulator_get(&dsi->dev, "power");
if (IS_ERR(ctx->power))
return dev_err_probe(&dsi->dev, PTR_ERR(ctx->power),
Expand Down Expand Up @@ -2722,8 +2708,6 @@ static const struct ili9881c_desc rpi_7inch_desc = {
.mode = &rpi_7inch_default_mode,
.mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_LPM,
.lanes = 2,
.flags = ILI9881_FLAGS_NO_SHUTDOWN_CMDS |
ILI9881_FLAGS_PANEL_ON_IN_PREPARE,
};

static const struct ili9881c_desc bsd1218_a101kl68_desc = {
Expand Down
Loading