diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-26 12:29:02 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-26 12:29:02 -0500 |
commit | 0512c04a2b5d29a33d96d315e1d14c55f5148aa7 (patch) | |
tree | 6373c0370abe32e1e42a933bd9cd08727e48b5d9 /Documentation/devicetree | |
parent | 5115f3c19d17851aaff5a857f55b4a019c908775 (diff) | |
parent | 4b07c5d5123f76487c61cf9dc3f987d0b8c88a94 (diff) |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
Pull LED subsystem update from Bryan Wu.
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds: (61 commits)
leds: leds-sunfire: use dev_err()/pr_err() instead of printk()
leds: 88pm860x: Add missing of_node_put()
leds: tca6507: Use of_get_child_count()
leds: leds-pwm: make it depend on PWM and not HAVE_PWM
Documentation: leds: update LP55xx family devices
leds-lp55xx: fix problem on removing LED attributes
leds-lp5521/5523: add author and copyright description
leds-lp5521/5523: use new lp55xx common header
leds-lp55xx: clean up headers
leds-lp55xx: clean up definitions
leds-lp55xx: clean up unused data and functions
leds-lp55xx: clean up _remove()
leds-lp55xx: add new function for removing device attribtues
leds-lp55xx: code refactoring on selftest function
leds-lp55xx: use common device attribute driver function
leds-lp55xx: support device specific attributes
leds-lp5523: use generic firmware interface
leds-lp5521: use generic firmware interface
leds-lp55xx: support firmware interface
leds-lp55xx: add new lp55xx_register_sysfs() for the firmware interface
...
Diffstat (limited to 'Documentation/devicetree')
-rw-r--r-- | Documentation/devicetree/bindings/leds/leds-pwm.txt | 48 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/leds/tca6507.txt | 33 |
2 files changed, 81 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/leds/leds-pwm.txt b/Documentation/devicetree/bindings/leds/leds-pwm.txt new file mode 100644 index 000000000000..7297107cf832 --- /dev/null +++ b/Documentation/devicetree/bindings/leds/leds-pwm.txt | |||
@@ -0,0 +1,48 @@ | |||
1 | LED connected to PWM | ||
2 | |||
3 | Required properties: | ||
4 | - compatible : should be "pwm-leds". | ||
5 | |||
6 | Each LED is represented as a sub-node of the pwm-leds device. Each | ||
7 | node's name represents the name of the corresponding LED. | ||
8 | |||
9 | LED sub-node properties: | ||
10 | - pwms : PWM property to point to the PWM device (phandle)/port (id) and to | ||
11 | specify the period time to be used: <&phandle id period_ns>; | ||
12 | - pwm-names : (optional) Name to be used by the PWM subsystem for the PWM device | ||
13 | For the pwms and pwm-names property please refer to: | ||
14 | Documentation/devicetree/bindings/pwm/pwm.txt | ||
15 | - max-brightness : Maximum brightness possible for the LED | ||
16 | - label : (optional) | ||
17 | see Documentation/devicetree/bindings/leds/common.txt | ||
18 | - linux,default-trigger : (optional) | ||
19 | see Documentation/devicetree/bindings/leds/common.txt | ||
20 | |||
21 | Example: | ||
22 | |||
23 | twl_pwm: pwm { | ||
24 | /* provides two PWMs (id 0, 1 for PWM1 and PWM2) */ | ||
25 | compatible = "ti,twl6030-pwm"; | ||
26 | #pwm-cells = <2>; | ||
27 | }; | ||
28 | |||
29 | twl_pwmled: pwmled { | ||
30 | /* provides one PWM (id 0 for Charing indicator LED) */ | ||
31 | compatible = "ti,twl6030-pwmled"; | ||
32 | #pwm-cells = <2>; | ||
33 | }; | ||
34 | |||
35 | pwmleds { | ||
36 | compatible = "pwm-leds"; | ||
37 | kpad { | ||
38 | label = "omap4::keypad"; | ||
39 | pwms = <&twl_pwm 0 7812500>; | ||
40 | max-brightness = <127>; | ||
41 | }; | ||
42 | |||
43 | charging { | ||
44 | label = "omap4:green:chrg"; | ||
45 | pwms = <&twl_pwmled 0 7812500>; | ||
46 | max-brightness = <255>; | ||
47 | }; | ||
48 | }; | ||
diff --git a/Documentation/devicetree/bindings/leds/tca6507.txt b/Documentation/devicetree/bindings/leds/tca6507.txt new file mode 100644 index 000000000000..2b6693b972fb --- /dev/null +++ b/Documentation/devicetree/bindings/leds/tca6507.txt | |||
@@ -0,0 +1,33 @@ | |||
1 | LEDs conected to tca6507 | ||
2 | |||
3 | Required properties: | ||
4 | - compatible : should be : "ti,tca6507". | ||
5 | |||
6 | Each led is represented as a sub-node of the ti,tca6507 device. | ||
7 | |||
8 | LED sub-node properties: | ||
9 | - label : (optional) see Documentation/devicetree/bindings/leds/common.txt | ||
10 | - reg : number of LED line (could be from 0 to 6) | ||
11 | - linux,default-trigger : (optional) | ||
12 | see Documentation/devicetree/bindings/leds/common.txt | ||
13 | |||
14 | Examples: | ||
15 | |||
16 | tca6507@45 { | ||
17 | compatible = "ti,tca6507"; | ||
18 | #address-cells = <1>; | ||
19 | #size-cells = <0>; | ||
20 | reg = <0x45>; | ||
21 | |||
22 | led0: red-aux@0 { | ||
23 | label = "red:aux"; | ||
24 | reg = <0x0>; | ||
25 | }; | ||
26 | |||
27 | led1: green-aux@1 { | ||
28 | label = "green:aux"; | ||
29 | reg = <0x5>; | ||
30 | linux,default-trigger = "default-on"; | ||
31 | }; | ||
32 | }; | ||
33 | |||