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

Commit ff9129b0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux 

Pull device tree fixes from Grant Likely:
 "Device tree bug fixes and documentation updates for v3.10

  Nothing earth shattering here.  A build failure fix, and fix for
  releasing nodes and some documenation updates."

* tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux:
  Documentation/devicetree: make semantic of initrd-end more explicit
  of/base: release the node correctly in of_parse_phandle_with_args()
  of/documentation: move video device bindings to a common place
  <linux/of_platform.h>: fix compilation warnings with DT disabled
parents 3c6a279f 3132f623

Documentation/devicetree/usage-model.txt

+5 −3
Original line number Diff line number Diff line
@@ -191,9 +191,11 @@ Linux it will look something like this: 
	};



The bootargs property contains the kernel arguments, and the initrd-*

properties define the address and size of an initrd blob.  The

chosen node may also optionally contain an arbitrary number of

additional properties for platform-specific configuration data.

properties define the address and size of an initrd blob.  Note that

initrd-end is the first address after the initrd image, so this doesn't

match the usual semantic of struct resource.  The chosen node may also

optionally contain an arbitrary number of additional properties for

platform-specific configuration data.



During early boot, the architecture setup code calls of_scan_flat_dt()

several times with different helper callbacks to parse device tree