| Message ID | 20200719080743.8560-15-sam@ravnborg.org |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | backlight: backlight updates | expand |
On Sun, Jul 19, 2020 at 10:07:38AM +0200, Sam Ravnborg wrote: > cr_bllcd can turn backlight ON or OFF. > Fix semantitics so they equals what we know from gpio-backlight. > brightness == 0 => backlight off > brightness == 1 => backlight on > > Use the backlight_get_brightness() helper to simplify the code. > > v2: > - reworked to introduce gpio-backlight semantics (Daniel) Wasn't this added for v5? However, I spotted this change amoung the other patches so no worries... > Signed-off-by: Sam Ravnborg <sam@ravnborg.org> > Cc: Lee Jones <lee.jones@linaro.org> > Cc: Daniel Thompson <daniel.thompson@linaro.org> > Cc: Jingoo Han <jingoohan1@gmail.com> Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org> Daniel.
On Mon, Jul 20, 2020 at 09:48:22AM +0100, Daniel Thompson wrote: > On Sun, Jul 19, 2020 at 10:07:38AM +0200, Sam Ravnborg wrote: > > cr_bllcd can turn backlight ON or OFF. > > Fix semantitics so they equals what we know from gpio-backlight. > > brightness == 0 => backlight off > > brightness == 1 => backlight on > > > > Use the backlight_get_brightness() helper to simplify the code. > > > > v2: > > - reworked to introduce gpio-backlight semantics (Daniel) > > Wasn't this added for v5? However, I spotted this change amoung the > other patches so no worries... I do not increment version for individual patches unless there are changes. So this is the second version of this patch, but included in the v5 submission. But I can see how this can confuse the receiver. I will consider to adapt to the practice to indicate version of submission and not the individual patches. > > > > Signed-off-by: Sam Ravnborg <sam@ravnborg.org> > > Cc: Lee Jones <lee.jones@linaro.org> > > Cc: Daniel Thompson <daniel.thompson@linaro.org> > > Cc: Jingoo Han <jingoohan1@gmail.com> > > Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org> Very much appreciated - thanks! Sam
diff --git a/drivers/video/backlight/cr_bllcd.c b/drivers/video/backlight/cr_bllcd.c index 4624b7b7c6a6..a24d42e1ea3c 100644 --- a/drivers/video/backlight/cr_bllcd.c +++ b/drivers/video/backlight/cr_bllcd.c @@ -63,22 +63,15 @@ static int cr_backlight_set_intensity(struct backlight_device *bd) u32 addr = gpio_bar + CRVML_PANEL_PORT; u32 cur = inl(addr); - if (bd->props.power == FB_BLANK_UNBLANK) - intensity = FB_BLANK_UNBLANK; - if (bd->props.fb_blank == FB_BLANK_UNBLANK) - intensity = FB_BLANK_UNBLANK; - if (bd->props.power == FB_BLANK_POWERDOWN) - intensity = FB_BLANK_POWERDOWN; - if (bd->props.fb_blank == FB_BLANK_POWERDOWN) - intensity = FB_BLANK_POWERDOWN; - - if (intensity == FB_BLANK_UNBLANK) { /* FULL ON */ - cur &= ~CRVML_BACKLIGHT_OFF; - outl(cur, addr); - } else if (intensity == FB_BLANK_POWERDOWN) { /* OFF */ + if (backlight_get_brightness(bd) == 0) { + /* OFF */ cur |= CRVML_BACKLIGHT_OFF; outl(cur, addr); - } /* anything else, don't bother */ + } else { + /* FULL ON */ + cur &= ~CRVML_BACKLIGHT_OFF; + outl(cur, addr); + } return 0; } @@ -90,9 +83,9 @@ static int cr_backlight_get_intensity(struct backlight_device *bd) u8 intensity; if (cur & CRVML_BACKLIGHT_OFF) - intensity = FB_BLANK_POWERDOWN; + intensity = 0; else - intensity = FB_BLANK_UNBLANK; + intensity = 1; return intensity; }
cr_bllcd can turn backlight ON or OFF. Fix semantitics so they equals what we know from gpio-backlight. brightness == 0 => backlight off brightness == 1 => backlight on Use the backlight_get_brightness() helper to simplify the code. v2: - reworked to introduce gpio-backlight semantics (Daniel) Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Lee Jones <lee.jones@linaro.org> Cc: Daniel Thompson <daniel.thompson@linaro.org> Cc: Jingoo Han <jingoohan1@gmail.com> --- drivers/video/backlight/cr_bllcd.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-)