Commit 5f18c078 authored by Dave Stevenson's avatar Dave Stevenson Committed by Maxime Ripard

drm/panel/raspberrypi-touchscreen: Initialise the bridge in prepare

The panel has a prepare call which is before video starts, and an
enable call which is after.
The Toshiba bridge should be configured before video, so move
the relevant power and initialisation calls to prepare.

Fixes: 2f733d61 ("drm/panel: Add support for the Raspberry Pi 7" Touchscreen.")
Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.com>
Signed-off-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20220415162513.42190-3-stefan.wahren@i2se.com
parent f92055ae
...@@ -265,7 +265,7 @@ static int rpi_touchscreen_noop(struct drm_panel *panel) ...@@ -265,7 +265,7 @@ static int rpi_touchscreen_noop(struct drm_panel *panel)
return 0; return 0;
} }
static int rpi_touchscreen_enable(struct drm_panel *panel) static int rpi_touchscreen_prepare(struct drm_panel *panel)
{ {
struct rpi_touchscreen *ts = panel_to_ts(panel); struct rpi_touchscreen *ts = panel_to_ts(panel);
int i; int i;
...@@ -295,6 +295,13 @@ static int rpi_touchscreen_enable(struct drm_panel *panel) ...@@ -295,6 +295,13 @@ static int rpi_touchscreen_enable(struct drm_panel *panel)
rpi_touchscreen_write(ts, DSI_STARTDSI, 0x01); rpi_touchscreen_write(ts, DSI_STARTDSI, 0x01);
msleep(100); msleep(100);
return 0;
}
static int rpi_touchscreen_enable(struct drm_panel *panel)
{
struct rpi_touchscreen *ts = panel_to_ts(panel);
/* Turn on the backlight. */ /* Turn on the backlight. */
rpi_touchscreen_i2c_write(ts, REG_PWM, 255); rpi_touchscreen_i2c_write(ts, REG_PWM, 255);
...@@ -349,7 +356,7 @@ static int rpi_touchscreen_get_modes(struct drm_panel *panel, ...@@ -349,7 +356,7 @@ static int rpi_touchscreen_get_modes(struct drm_panel *panel,
static const struct drm_panel_funcs rpi_touchscreen_funcs = { static const struct drm_panel_funcs rpi_touchscreen_funcs = {
.disable = rpi_touchscreen_disable, .disable = rpi_touchscreen_disable,
.unprepare = rpi_touchscreen_noop, .unprepare = rpi_touchscreen_noop,
.prepare = rpi_touchscreen_noop, .prepare = rpi_touchscreen_prepare,
.enable = rpi_touchscreen_enable, .enable = rpi_touchscreen_enable,
.get_modes = rpi_touchscreen_get_modes, .get_modes = rpi_touchscreen_get_modes,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment