drm/panel: osd-osd101t2587-53ts: use drm_panel backlight support

Use the backlight support in drm_panel to simplify the driver

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20191207140353.23967-15-sam@ravnborg.org

diff --git a/drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c b/drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c
index 2734b48..3a0229d 100644 (file)
--- a/drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c
+++ b/drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c
@@ -4,7 +4,6 @@
  *  Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
  */
 
-#include <linux/backlight.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/regulator/consumer.h>
@@ -20,7 +19,6 @@ struct osd101t2587_panel {
        struct drm_panel base;
        struct mipi_dsi_device *dsi;
 
-       struct backlight_device *backlight;
        struct regulator *supply;
 
        bool prepared;
@@ -42,8 +40,6 @@ static int osd101t2587_panel_disable(struct drm_panel *panel)
        if (!osd101t2587->enabled)
                return 0;
 
-       backlight_disable(osd101t2587->backlight);
-
        ret = mipi_dsi_shutdown_peripheral(osd101t2587->dsi);
 
        osd101t2587->enabled = false;
@@ -91,8 +87,6 @@ static int osd101t2587_panel_enable(struct drm_panel *panel)
        if (ret)
                return ret;
 
-       backlight_enable(osd101t2587->backlight);
-
        osd101t2587->enabled = true;
 
        return ret;
@@ -158,18 +152,19 @@ MODULE_DEVICE_TABLE(of, osd101t2587_of_match);
 static int osd101t2587_panel_add(struct osd101t2587_panel *osd101t2587)
 {
        struct device *dev = &osd101t2587->dsi->dev;
+       int ret;
 
        osd101t2587->supply = devm_regulator_get(dev, "power");
        if (IS_ERR(osd101t2587->supply))
                return PTR_ERR(osd101t2587->supply);
 
-       osd101t2587->backlight = devm_of_find_backlight(dev);
-       if (IS_ERR(osd101t2587->backlight))
-               return PTR_ERR(osd101t2587->backlight);
-
        drm_panel_init(&osd101t2587->base, &osd101t2587->dsi->dev,
                       &osd101t2587_panel_funcs, DRM_MODE_CONNECTOR_DSI);
 
+       ret = drm_panel_of_backlight(&osd101t2587->base);
+       if (ret)
+               return ret;
+
        return drm_panel_add(&osd101t2587->base);
 }
 
@@ -215,12 +210,11 @@ static int osd101t2587_panel_remove(struct mipi_dsi_device *dsi)
        struct osd101t2587_panel *osd101t2587 = mipi_dsi_get_drvdata(dsi);
        int ret;
 
-       ret = osd101t2587_panel_disable(&osd101t2587->base);
+       ret = drm_panel_disable(&osd101t2587->base);
        if (ret < 0)
                dev_warn(&dsi->dev, "failed to disable panel: %d\n", ret);
 
-       osd101t2587_panel_unprepare(&osd101t2587->base);
-
+       drm_panel_unprepare(&osd101t2587->base);
        drm_panel_remove(&osd101t2587->base);
 
        ret = mipi_dsi_detach(dsi);
@@ -234,8 +228,8 @@ static void osd101t2587_panel_shutdown(struct mipi_dsi_device *dsi)
 {
        struct osd101t2587_panel *osd101t2587 = mipi_dsi_get_drvdata(dsi);
 
-       osd101t2587_panel_disable(&osd101t2587->base);
-       osd101t2587_panel_unprepare(&osd101t2587->base);
+       drm_panel_disable(&osd101t2587->base);
+       drm_panel_unprepare(&osd101t2587->base);
 }
 
 static struct mipi_dsi_driver osd101t2587_panel_driver = {