mirror of
https://github.com/torvalds/linux.git
synced 2024-12-05 18:41:23 +00:00
Merge remote-tracking branch 'drm-misc/drm-misc-next-fixes' into drm-misc-fixes
We have a few leftovers from the merge window period in drm-misc-next-fixes, let's bring them into drm-misc-fixes Signed-off-by: Maxime Ripard <maxime@cerno.tech>
This commit is contained in:
commit
0537036661
@ -37,6 +37,9 @@ properties:
|
||||
|
||||
reset-gpios: true
|
||||
|
||||
'mantix,tp-rstn-gpios':
|
||||
description: second reset line that triggers DSI config load
|
||||
|
||||
backlight: true
|
||||
|
||||
required:
|
||||
@ -63,6 +66,7 @@ examples:
|
||||
avee-supply = <®_avee>;
|
||||
vddi-supply = <®_1v8_p>;
|
||||
reset-gpios = <&gpio1 29 GPIO_ACTIVE_LOW>;
|
||||
mantix,tp-rstn-gpios = <&gpio1 24 GPIO_ACTIVE_LOW>;
|
||||
backlight = <&backlight>;
|
||||
};
|
||||
};
|
||||
|
@ -26,7 +26,9 @@
|
||||
struct mantix {
|
||||
struct device *dev;
|
||||
struct drm_panel panel;
|
||||
|
||||
struct gpio_desc *reset_gpio;
|
||||
struct gpio_desc *tp_rstn_gpio;
|
||||
|
||||
struct regulator *avdd;
|
||||
struct regulator *avee;
|
||||
@ -124,6 +126,10 @@ static int mantix_unprepare(struct drm_panel *panel)
|
||||
{
|
||||
struct mantix *ctx = panel_to_mantix(panel);
|
||||
|
||||
gpiod_set_value_cansleep(ctx->tp_rstn_gpio, 1);
|
||||
usleep_range(5000, 6000);
|
||||
gpiod_set_value_cansleep(ctx->reset_gpio, 1);
|
||||
|
||||
regulator_disable(ctx->avee);
|
||||
regulator_disable(ctx->avdd);
|
||||
/* T11 */
|
||||
@ -165,13 +171,10 @@ static int mantix_prepare(struct drm_panel *panel)
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* T3+T5 */
|
||||
usleep_range(10000, 12000);
|
||||
|
||||
gpiod_set_value_cansleep(ctx->reset_gpio, 1);
|
||||
usleep_range(5150, 7000);
|
||||
|
||||
/* T3 + T4 + time for voltage to become stable: */
|
||||
usleep_range(6000, 7000);
|
||||
gpiod_set_value_cansleep(ctx->reset_gpio, 0);
|
||||
gpiod_set_value_cansleep(ctx->tp_rstn_gpio, 0);
|
||||
|
||||
/* T6 */
|
||||
msleep(50);
|
||||
@ -204,7 +207,7 @@ static int mantix_get_modes(struct drm_panel *panel,
|
||||
if (!mode) {
|
||||
dev_err(ctx->dev, "Failed to add mode %ux%u@%u\n",
|
||||
default_mode.hdisplay, default_mode.vdisplay,
|
||||
drm_mode_vrefresh(mode));
|
||||
drm_mode_vrefresh(&default_mode));
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
@ -236,12 +239,18 @@ static int mantix_probe(struct mipi_dsi_device *dsi)
|
||||
if (!ctx)
|
||||
return -ENOMEM;
|
||||
|
||||
ctx->reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW);
|
||||
ctx->reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH);
|
||||
if (IS_ERR(ctx->reset_gpio)) {
|
||||
dev_err(dev, "cannot get reset gpio\n");
|
||||
return PTR_ERR(ctx->reset_gpio);
|
||||
}
|
||||
|
||||
ctx->tp_rstn_gpio = devm_gpiod_get(dev, "mantix,tp-rstn", GPIOD_OUT_HIGH);
|
||||
if (IS_ERR(ctx->tp_rstn_gpio)) {
|
||||
dev_err(dev, "cannot get tp-rstn gpio\n");
|
||||
return PTR_ERR(ctx->tp_rstn_gpio);
|
||||
}
|
||||
|
||||
mipi_dsi_set_drvdata(dsi, ctx);
|
||||
ctx->dev = dev;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user