From: David Heidelberg <[email protected]> The reset was introduced with wrong polarity. Correct for the future compatibles and keep current with reverted logic.
Old DTs keep GPIO_ACTIVE_HIGH and are fixed up via gpiod_toggle_active_low() on the deprecated compatible. Assisted-by: LLM Signed-off-by: David Heidelberg <[email protected]> --- drivers/gpu/drm/panel/panel-samsung-s6e3ha8.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-samsung-s6e3ha8.c b/drivers/gpu/drm/panel/panel-samsung-s6e3ha8.c index 5e1e997b83b36..99290913de69a 100644 --- a/drivers/gpu/drm/panel/panel-samsung-s6e3ha8.c +++ b/drivers/gpu/drm/panel/panel-samsung-s6e3ha8.c @@ -20,16 +20,17 @@ #include "panel-samsung-dsi.h" struct s6e3ha8_desc { const struct drm_panel_funcs *funcs; const struct drm_display_mode *mode; unsigned long mode_flags; const struct regulator_bulk_data *supplies; unsigned int num_supplies; + bool broken_reset_polarity; }; struct s6e3ha8 { struct drm_panel panel; struct mipi_dsi_device *dsi; const struct s6e3ha8_desc *desc; struct drm_dsc_config dsc; struct gpio_desc *reset_gpio; @@ -62,22 +63,22 @@ static int s6e3ha8_unprepare(struct drm_panel *panel) { struct s6e3ha8 *priv = to_s6e3ha8(panel); return regulator_bulk_disable(priv->desc->num_supplies, priv->supplies); } static void s6e3ha8_amb577px01_wqhd_reset(struct s6e3ha8 *priv) { - gpiod_set_value_cansleep(priv->reset_gpio, 1); - usleep_range(5000, 6000); gpiod_set_value_cansleep(priv->reset_gpio, 0); usleep_range(5000, 6000); gpiod_set_value_cansleep(priv->reset_gpio, 1); usleep_range(5000, 6000); + gpiod_set_value_cansleep(priv->reset_gpio, 0); + usleep_range(5000, 6000); } static int s6e3ha8_amb577px01_wqhd_on(struct s6e3ha8 *priv) { struct mipi_dsi_device *dsi = priv->dsi; struct mipi_dsi_multi_context ctx = { .dsi = dsi }; dsi->mode_flags |= MIPI_DSI_MODE_LPM; @@ -203,17 +204,17 @@ static int s6e3ha8_amb577px01_wqhd_prepare(struct drm_panel *panel) ret = regulator_bulk_enable(priv->desc->num_supplies, priv->supplies); if (ret < 0) return ret; mipi_dsi_msleep(&ctx, 120); s6e3ha8_amb577px01_wqhd_reset(priv); ret = s6e3ha8_amb577px01_wqhd_on(priv); if (ret < 0) { - gpiod_set_value_cansleep(priv->reset_gpio, 0); + gpiod_set_value_cansleep(priv->reset_gpio, 1); goto err; } drm_dsc_pps_payload_pack(&pps, &priv->dsc); samsung_dsi_test_key_on_lvl1(&ctx); mipi_dsi_picture_parameter_set_multi(&ctx, &pps); samsung_dsi_test_key_off_lvl1(&ctx); @@ -243,16 +244,27 @@ static const struct drm_display_mode s6e3ha8_amb577px01_wqhd_mode = { static const struct drm_panel_funcs s6e3ha8_amb577px01_wqhd_panel_funcs = { .prepare = s6e3ha8_amb577px01_wqhd_prepare, .unprepare = s6e3ha8_unprepare, .get_modes = s6e3ha8_get_modes, .enable = s6e3ha8_amb577px01_wqhd_enable, .disable = s6e3ha8_amb577px01_wqhd_disable, }; +static const struct s6e3ha8_desc s6e3ha8_amb577px01_wqhd_desc_legacy = { + .funcs = &s6e3ha8_amb577px01_wqhd_panel_funcs, + .mode = &s6e3ha8_amb577px01_wqhd_mode, + .mode_flags = MIPI_DSI_CLOCK_NON_CONTINUOUS | + MIPI_DSI_MODE_VIDEO_NO_HFP | MIPI_DSI_MODE_VIDEO_NO_HBP | + MIPI_DSI_MODE_VIDEO_NO_HSA | MIPI_DSI_MODE_NO_EOT_PACKET, + .supplies = s6e3ha8_vddr_supplies, + .num_supplies = ARRAY_SIZE(s6e3ha8_vddr_supplies), + .broken_reset_polarity = true, +}; + static const struct s6e3ha8_desc s6e3ha8_amb577px01_wqhd_desc = { .funcs = &s6e3ha8_amb577px01_wqhd_panel_funcs, .mode = &s6e3ha8_amb577px01_wqhd_mode, .mode_flags = MIPI_DSI_CLOCK_NON_CONTINUOUS | MIPI_DSI_MODE_VIDEO_NO_HFP | MIPI_DSI_MODE_VIDEO_NO_HBP | MIPI_DSI_MODE_VIDEO_NO_HSA | MIPI_DSI_MODE_NO_EOT_PACKET, .supplies = s6e3ha8_vddr_supplies, .num_supplies = ARRAY_SIZE(s6e3ha8_vddr_supplies), @@ -283,16 +295,19 @@ static int s6e3ha8_probe(struct mipi_dsi_device *dsi) return ret; } priv->reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH); if (IS_ERR(priv->reset_gpio)) return dev_err_probe(dev, PTR_ERR(priv->reset_gpio), "Failed to get reset-gpios\n"); + if (priv->desc->broken_reset_polarity) + gpiod_toggle_active_low(priv->reset_gpio); + priv->dsi = dsi; mipi_dsi_set_drvdata(dsi, priv); dsi->lanes = 4; dsi->format = MIPI_DSI_FMT_RGB888; dsi->mode_flags = priv->desc->mode_flags; priv->panel.prepare_prev_first = true; @@ -323,17 +338,17 @@ static int s6e3ha8_probe(struct mipi_dsi_device *dsi) return 0; } static const struct of_device_id s6e3ha8_of_match[] = { { /* deprecated */ .compatible = "samsung,s6e3ha8", - .data = &s6e3ha8_amb577px01_wqhd_desc, + .data = &s6e3ha8_amb577px01_wqhd_desc_legacy, }, { .compatible = "samsung,s6e3ha8-amb577px01", .data = &s6e3ha8_amb577px01_wqhd_desc, }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, s6e3ha8_of_match); -- 2.55.0
