Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a92a385 authored by Rob Herring's avatar Rob Herring
Browse files

Merge remote-tracking branch 'grant/devicetree/next' into for-next

parents 50c8af4c 155dd0c2

Documentation/devicetree/bindings/gpio/led.txt

+4 −10
Original line number Diff line number Diff line
@@ -10,16 +10,10 @@ LED sub-node properties: 
- gpios :  Should specify the LED's GPIO, see "gpios property" in

  Documentation/devicetree/bindings/gpio/gpio.txt.  Active low LEDs should be

  indicated using flags in the GPIO specifier.

- label :  (optional) The label for this LED.  If omitted, the label is

  taken from the node name (excluding the unit address).

- linux,default-trigger :  (optional) This parameter, if present, is a

  string defining the trigger assigned to the LED.  Current triggers are:

    "backlight" - LED will act as a back-light, controlled by the framebuffer

		  system

    "default-on" - LED will turn on, but see "default-state" below

    "heartbeat" - LED "double" flashes at a load average based rate

    "ide-disk" - LED indicates disk activity

    "timer" - LED flashes at a fixed, configurable rate

- label :  (optional)

  see Documentation/devicetree/bindings/leds/common.txt

- linux,default-trigger :  (optional)

  see Documentation/devicetree/bindings/leds/common.txt

- default-state:  (optional) The initial state of the LED.  Valid

  values are "on", "off", and "keep".  If the LED is already on or off

  and the default-state property is set the to same value, then no

Documentation/devicetree/bindings/leds/common.txt

0 → 100644
+23 −0
Original line number Diff line number Diff line 
Common leds properties.



Optional properties for child nodes:

- label : The label for this LED.  If omitted, the label is

  taken from the node name (excluding the unit address).



- linux,default-trigger :  This parameter, if present, is a

    string defining the trigger assigned to the LED.  Current triggers are:

     "backlight" - LED will act as a back-light, controlled by the framebuffer

		   system

     "default-on" - LED will turn on (but for leds-gpio see "default-state"

		    property in Documentation/devicetree/bindings/gpio/led.txt)

     "heartbeat" - LED "double" flashes at a load average based rate

     "ide-disk" - LED indicates disk activity

     "timer" - LED flashes at a fixed, configurable rate



Examples:



system-status {

	label = "Status";

	linux,default-trigger = "heartbeat";

	...

};

Documentation/devicetree/usage-model.txt

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ later), which will happily live at the base of the Linux /sys/devices 
tree.  Therefore, if a DT node is at the root of the tree, then it

really probably is best registered as a platform_device.



Linux board support code calls of_platform_populate(NULL, NULL, NULL)

Linux board support code calls of_platform_populate(NULL, NULL, NULL, NULL)

to kick off discovery of devices at the root of the tree.  The

parameters are all NULL because when starting from the root of the

tree, there is no need to provide a starting node (the first NULL), a

scripts/dtc/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -27,3 +27,5 @@ HOSTCFLAGS_dtc-parser.tab.o := $(HOSTCFLAGS_DTC) 
# dependencies on generated files need to be listed explicitly

$(obj)/dtc-lexer.lex.o: $(obj)/dtc-parser.tab.h



# generated files need to be cleaned explicitly

clean-files	:= dtc-lexer.lex.c dtc-parser.tab.c dtc-parser.tab.h