drm/panel: olimex-lcd-olinuxino: use drm_panel backlight support
authorSam Ravnborg <sam@ravnborg.org>
Sat, 7 Dec 2019 14:03:41 +0000 (15:03 +0100)
committerSam Ravnborg <sam@ravnborg.org>
Mon, 9 Dec 2019 21:57:26 +0000 (22:57 +0100)
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: Stefan Mavrodiev <stefan@olimex.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20191207140353.23967-14-sam@ravnborg.org
drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c

index e553e584399b671c4e089d82f5e643ac3208070b..09deb99981a417749b0006c30acb7017afb947b4 100644 (file)
@@ -6,7 +6,6 @@
  *   Author: Stefan Mavrodiev <stefan@olimex.com>
  */
 
-#include <linux/backlight.h>
 #include <linux/crc32.h>
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
@@ -68,7 +67,6 @@ struct lcd_olinuxino {
        bool prepared;
        bool enabled;
 
-       struct backlight_device *backlight;
        struct regulator *supply;
        struct gpio_desc *enable_gpio;
 
@@ -87,8 +85,6 @@ static int lcd_olinuxino_disable(struct drm_panel *panel)
        if (!lcd->enabled)
                return 0;
 
-       backlight_disable(lcd->backlight);
-
        lcd->enabled = false;
 
        return 0;
@@ -134,8 +130,6 @@ static int lcd_olinuxino_enable(struct drm_panel *panel)
        if (lcd->enabled)
                return 0;
 
-       backlight_enable(lcd->backlight);
-
        lcd->enabled = true;
 
        return 0;
@@ -283,13 +277,13 @@ static int lcd_olinuxino_probe(struct i2c_client *client,
        if (IS_ERR(lcd->enable_gpio))
                return PTR_ERR(lcd->enable_gpio);
 
-       lcd->backlight = devm_of_find_backlight(dev);
-       if (IS_ERR(lcd->backlight))
-               return PTR_ERR(lcd->backlight);
-
        drm_panel_init(&lcd->panel, dev, &lcd_olinuxino_funcs,
                       DRM_MODE_CONNECTOR_DPI);
 
+       ret = drm_panel_of_backlight(&lcd->panel);
+       if (ret)
+               return ret;
+
        return drm_panel_add(&lcd->panel);
 }
 
@@ -299,8 +293,8 @@ static int lcd_olinuxino_remove(struct i2c_client *client)
 
        drm_panel_remove(&panel->panel);
 
-       lcd_olinuxino_disable(&panel->panel);
-       lcd_olinuxino_unprepare(&panel->panel);
+       drm_panel_disable(&panel->panel);
+       drm_panel_unprepare(&panel->panel);
 
        return 0;
 }