diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-11-02 14:46:31 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-11-02 14:46:31 -1000 |
| commit | 38984d78721811c45c4a194784133254903697eb (patch) | |
| tree | ea3c7214ea462dfd50bb9ee65b114c7b7864d7a8 /drivers/video | |
| parent | 27bc0782ef8ec26ed94b9fa16c75c11fdb3cd78b (diff) | |
| parent | d5272d39995f4150062a67e6f2cef556edece740 (diff) | |
Merge tag 'backlight-next-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight
Pull backlight updates from Lee Jones:
"New Functionality:
- Add new Device Tree binding for Monolithic Power (MPS) MP3309C
step-up converter
- Document brightness-levels in bindings for; generic, LED and PWM
Bug Fixes:
- Ensure PWMs are disabled on .shutdown(), .suspend() and .remove()"
* tag 'backlight-next-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
dt-bindings: backlight: Add brightness-levels related common properties
backlight: pwm_bl: Disable PWM on shutdown, suspend and remove
dt-bindings: backlight: Add MPS MP3309C
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/backlight/pwm_bl.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c index a51fbab96368..289bd9ce4d36 100644 --- a/drivers/video/backlight/pwm_bl.c +++ b/drivers/video/backlight/pwm_bl.c @@ -626,9 +626,14 @@ static void pwm_backlight_remove(struct platform_device *pdev) { struct backlight_device *bl = platform_get_drvdata(pdev); struct pwm_bl_data *pb = bl_get_data(bl); + struct pwm_state state; backlight_device_unregister(bl); pwm_backlight_power_off(pb); + pwm_get_state(pb->pwm, &state); + state.duty_cycle = 0; + state.enabled = false; + pwm_apply_state(pb->pwm, &state); if (pb->exit) pb->exit(&pdev->dev); @@ -638,8 +643,13 @@ static void pwm_backlight_shutdown(struct platform_device *pdev) { struct backlight_device *bl = platform_get_drvdata(pdev); struct pwm_bl_data *pb = bl_get_data(bl); + struct pwm_state state; pwm_backlight_power_off(pb); + pwm_get_state(pb->pwm, &state); + state.duty_cycle = 0; + state.enabled = false; + pwm_apply_state(pb->pwm, &state); } #ifdef CONFIG_PM_SLEEP @@ -647,12 +657,24 @@ static int pwm_backlight_suspend(struct device *dev) { struct backlight_device *bl = dev_get_drvdata(dev); struct pwm_bl_data *pb = bl_get_data(bl); + struct pwm_state state; if (pb->notify) pb->notify(pb->dev, 0); pwm_backlight_power_off(pb); + /* + * Note that disabling the PWM doesn't guarantee that the output stays + * at its inactive state. However without the PWM disabled, the PWM + * driver refuses to suspend. So disable here even though this might + * enable the backlight on poorly designed boards. + */ + pwm_get_state(pb->pwm, &state); + state.duty_cycle = 0; + state.enabled = false; + pwm_apply_state(pb->pwm, &state); + if (pb->notify_after) pb->notify_after(pb->dev, 0); |