aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-04-06 18:20:24 -0400
committerBryan Wu <cooloney@gmail.com>2014-05-08 02:28:07 -0400
commitb0571e7e4ec4d62b27711758417c388042f7bae7 (patch)
tree5955d8df122121f629d058aa40c181d19a8f4dd9
parentd19a8a7078a9a8e254c030bcdb6732d26cbd6c16 (diff)
leds: leds-pwm: add DT support for LEDs wired to supply
The non-DT driver allowed an active low property to be specified, but DT is missing this in its description. Add the property to the DT binding document, making it optional. It defaults to active high, which retains compatibility with existing descriptions. This should only be used for causes where the LED is wired to supply, and the PWM does not sensibly support its own inversion. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Bryan Wu <cooloney@gmail.com>
-rw-r--r--Documentation/devicetree/bindings/leds/leds-pwm.txt2
-rw-r--r--drivers/leds/leds-pwm.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/leds/leds-pwm.txt b/Documentation/devicetree/bindings/leds/leds-pwm.txt
index 7297107cf832..6c6583c35f2f 100644
--- a/Documentation/devicetree/bindings/leds/leds-pwm.txt
+++ b/Documentation/devicetree/bindings/leds/leds-pwm.txt
@@ -13,6 +13,8 @@ LED sub-node properties:
13 For the pwms and pwm-names property please refer to: 13 For the pwms and pwm-names property please refer to:
14 Documentation/devicetree/bindings/pwm/pwm.txt 14 Documentation/devicetree/bindings/pwm/pwm.txt
15- max-brightness : Maximum brightness possible for the LED 15- max-brightness : Maximum brightness possible for the LED
16- active-low : (optional) For PWMs where the LED is wired to supply
17 rather than ground.
16- label : (optional) 18- label : (optional)
17 see Documentation/devicetree/bindings/leds/common.txt 19 see Documentation/devicetree/bindings/leds/common.txt
18- linux,default-trigger : (optional) 20- linux,default-trigger : (optional)
diff --git a/drivers/leds/leds-pwm.c b/drivers/leds/leds-pwm.c
index 8bd225df14de..f5cf1b0f2748 100644
--- a/drivers/leds/leds-pwm.c
+++ b/drivers/leds/leds-pwm.c
@@ -154,6 +154,7 @@ static int led_pwm_create_of(struct device *dev, struct led_pwm_priv *priv)
154 154
155 led.default_trigger = of_get_property(child, 155 led.default_trigger = of_get_property(child,
156 "linux,default-trigger", NULL); 156 "linux,default-trigger", NULL);
157 led.active_low = of_property_read_bool(child, "active-low");
157 of_property_read_u32(child, "max-brightness", 158 of_property_read_u32(child, "max-brightness",
158 &led.max_brightness); 159 &led.max_brightness);
159 160