diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-06 10:53:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-06 10:53:48 -0800 |
| commit | 5bc23a0cdee4a6757fcc2919eb26827fe11e3bee (patch) | |
| tree | d401c7e620a1ea80099aaa348f5408edd5976912 /Documentation | |
| parent | mfd: avoid newly introduced compiler warning (diff) | |
| parent | backlight: pm8941-wled: Add default-brightness property (diff) | |
| download | linux-dev-5bc23a0cdee4a6757fcc2919eb26827fe11e3bee.tar.xz linux-dev-5bc23a0cdee4a6757fcc2919eb26827fe11e3bee.zip | |
Merge tag 'backlight-for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight
Pull backlight updates from Lee Jones:
"New Device Support
- None
New Functionality:
- None
Core Frameworks:
- Reject legacy PWM request for device defined in DT
Fix-ups:
- Remove unnecessary MODULE_ALIAS(); adp8860_bl, adp8870_bl
- Simplify code: pm8941-wled
- Supply default-brightness logic; pm8941-wled
Bug Fixes:
- Clean up OF node; 88pm860x_bl
- Ensure struct is zeroed; lp855x_bl"
* tag 'backlight-for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
backlight: pm8941-wled: Add default-brightness property
backlight: pm8941-wled: Fix ptr_ret.cocci warnings
backlight: pwm: Reject legacy PWM request for device defined in DT
backlight: 88pm860x_bl: Add missing of_node_put
backlight: adp8870: Remove unnecessary MODULE_ALIAS()
backlight: adp8860: Remove unnecessary MODULE_ALIAS()
backlight: lp855x: Make sure props struct is zeroed
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/video/backlight/pm8941-wled.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/video/backlight/pm8941-wled.txt b/Documentation/devicetree/bindings/video/backlight/pm8941-wled.txt index 424f8444a6cd..e5b294dafc58 100644 --- a/Documentation/devicetree/bindings/video/backlight/pm8941-wled.txt +++ b/Documentation/devicetree/bindings/video/backlight/pm8941-wled.txt @@ -5,6 +5,8 @@ Required properties: - reg: slave address Optional properties: +- default-brightness: brightness value on boot, value from: 0-4095 + default: 2048 - label: The name of the backlight device - qcom,cs-out: bool; enable current sink output - qcom,cabc: bool; enable content adaptive backlight control |