Commit bf8c9550 authored by Thomas Zimmermann's avatar Thomas Zimmermann Committed by Lee Jones

backlight: omap1: Replace FB_BLANK_ states with simple on/off

The backlight is on for fb_blank eq FB_BLANK_UNBLANK, or off for
any other value in fb_blank. But the field fb_blank in struct
backlight_properties is deprecated and should not be used any
longer.

Replace the test for fb_blank in omap's backlight code with a
simple boolean parameter and push the test into the update_status
helper. Instead of reading fb_blank directly, decode the backlight
device's status with backlight_is_blank().
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: default avatarDaniel Thompson <daniel.thompson@linaro.org>
Link: https://lore.kernel.org/r/20240319093915.31778-4-tzimmermann@suse.deSigned-off-by: default avatarLee Jones <lee@kernel.org>
parent b7ad4c67
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/fb.h>
#include <linux/backlight.h> #include <linux/backlight.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/platform_data/omap1_bl.h> #include <linux/platform_data/omap1_bl.h>
...@@ -20,7 +19,7 @@ ...@@ -20,7 +19,7 @@
#define OMAPBL_MAX_INTENSITY 0xff #define OMAPBL_MAX_INTENSITY 0xff
struct omap_backlight { struct omap_backlight {
int powermode; bool enabled;
int current_intensity; int current_intensity;
struct device *dev; struct device *dev;
...@@ -37,21 +36,14 @@ static inline void omapbl_send_enable(int enable) ...@@ -37,21 +36,14 @@ static inline void omapbl_send_enable(int enable)
omap_writeb(enable, OMAP_PWL_CLK_ENABLE); omap_writeb(enable, OMAP_PWL_CLK_ENABLE);
} }
static void omapbl_blank(struct omap_backlight *bl, int mode) static void omapbl_enable(struct omap_backlight *bl, bool enable)
{ {
switch (mode) { if (enable) {
case FB_BLANK_NORMAL:
case FB_BLANK_VSYNC_SUSPEND:
case FB_BLANK_HSYNC_SUSPEND:
case FB_BLANK_POWERDOWN:
omapbl_send_intensity(0);
omapbl_send_enable(0);
break;
case FB_BLANK_UNBLANK:
omapbl_send_intensity(bl->current_intensity); omapbl_send_intensity(bl->current_intensity);
omapbl_send_enable(1); omapbl_send_enable(1);
break; } else {
omapbl_send_intensity(0);
omapbl_send_enable(0);
} }
} }
...@@ -61,7 +53,7 @@ static int omapbl_suspend(struct device *dev) ...@@ -61,7 +53,7 @@ static int omapbl_suspend(struct device *dev)
struct backlight_device *bl_dev = dev_get_drvdata(dev); struct backlight_device *bl_dev = dev_get_drvdata(dev);
struct omap_backlight *bl = bl_get_data(bl_dev); struct omap_backlight *bl = bl_get_data(bl_dev);
omapbl_blank(bl, FB_BLANK_POWERDOWN); omapbl_enable(bl, false);
return 0; return 0;
} }
...@@ -70,33 +62,34 @@ static int omapbl_resume(struct device *dev) ...@@ -70,33 +62,34 @@ static int omapbl_resume(struct device *dev)
struct backlight_device *bl_dev = dev_get_drvdata(dev); struct backlight_device *bl_dev = dev_get_drvdata(dev);
struct omap_backlight *bl = bl_get_data(bl_dev); struct omap_backlight *bl = bl_get_data(bl_dev);
omapbl_blank(bl, bl->powermode); omapbl_enable(bl, bl->enabled);
return 0; return 0;
} }
#endif #endif
static int omapbl_set_power(struct backlight_device *dev, int state) static void omapbl_set_enabled(struct backlight_device *dev, bool enable)
{ {
struct omap_backlight *bl = bl_get_data(dev); struct omap_backlight *bl = bl_get_data(dev);
omapbl_blank(bl, state); omapbl_enable(bl, enable);
bl->powermode = state; bl->enabled = enable;
return 0;
} }
static int omapbl_update_status(struct backlight_device *dev) static int omapbl_update_status(struct backlight_device *dev)
{ {
struct omap_backlight *bl = bl_get_data(dev); struct omap_backlight *bl = bl_get_data(dev);
bool enable;
if (bl->current_intensity != dev->props.brightness) { if (bl->current_intensity != dev->props.brightness) {
if (bl->powermode == FB_BLANK_UNBLANK) if (bl->enabled)
omapbl_send_intensity(dev->props.brightness); omapbl_send_intensity(dev->props.brightness);
bl->current_intensity = dev->props.brightness; bl->current_intensity = dev->props.brightness;
} }
if (dev->props.fb_blank != bl->powermode) enable = !backlight_is_blank(dev);
omapbl_set_power(dev, dev->props.fb_blank);
if (enable != bl->enabled)
omapbl_set_enabled(dev, enable);
return 0; return 0;
} }
...@@ -136,7 +129,7 @@ static int omapbl_probe(struct platform_device *pdev) ...@@ -136,7 +129,7 @@ static int omapbl_probe(struct platform_device *pdev)
if (IS_ERR(dev)) if (IS_ERR(dev))
return PTR_ERR(dev); return PTR_ERR(dev);
bl->powermode = FB_BLANK_POWERDOWN; bl->enabled = false;
bl->current_intensity = 0; bl->current_intensity = 0;
bl->pdata = pdata; bl->pdata = pdata;
......
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