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

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

Merge tag 'devicetree-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux 

Pull devicetree updates from Rob Herring:

 - Rewrite of the unflattening code to avoid recursion and lessen the
   stack usage.

 - Rewrite of the phandle args parsing code to get rid of the fixed args
   size.  This is needed for IOMMU code.

 - Sync to latest dtc which adds more dts style checking.  These
   warnings are enabled with "W=1" compiles.

 - Tegra documentation updates related to the above warnings.

 - A bunch of spelling and other doc fixes.

 - Various vendor prefix additions.

* tag 'devicetree-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (52 commits)
  devicetree: Add Creative Technology vendor id
  gpio: dt-bindings: add ibm,ppc4xx-gpio binding
  of/unittest: Remove unnecessary module.h header inclusion
  drivers/of: Fix build warning in populate_node()
  drivers/of: Fix depth when unflattening devicetree
  of: dynamic: changeset prop-update revert fix
  drivers/of: Export of_detach_node()
  drivers/of: Return allocated memory from of_fdt_unflatten_tree()
  drivers/of: Specify parent node in of_fdt_unflatten_tree()
  drivers/of: Rename unflatten_dt_node()
  drivers/of: Avoid recursively calling unflatten_dt_node()
  drivers/of: Split unflatten_dt_node()
  of: include errno.h in of_graph.h
  of: document refcount incrementation of of_get_cpu_node()
  Documentation: dt: soc: fix spelling mistakes
  Documentation: dt: power: fix spelling mistake
  Documentation: dt: pinctrl: fix spelling mistake
  Documentation: dt: opp: fix spelling mistake
  Documentation: dt: net: fix spelling mistakes
  Documentation: dt: mtd: fix spelling mistake
  ...
parents 76b584d3 f2c27767

Documentation/devicetree/bindings/arm/cci.txt

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ specific to ARM. 
				 "arm,cci-400-pmu,r0"

				 "arm,cci-400-pmu,r1"

				 "arm,cci-400-pmu"  - DEPRECATED, permitted only where OS has

						      secure acces to CCI registers

						      secure access to CCI registers

				 "arm,cci-500-pmu,r0"

				 "arm,cci-550-pmu,r0"

		- reg:

Documentation/devicetree/bindings/arm/omap/crossbar.txt

+2 −1
Original line number Diff line number Diff line
@@ -42,7 +42,8 @@ Examples: 
Consumer:

========

See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt and

Documentation/devicetree/bindings/arm/gic.txt for further details.

Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt for

further details.



An interrupt consumer on an SoC using crossbar will use:

	interrupts = <GIC_SPI request_number interrupt_level>

Documentation/devicetree/bindings/arm/ux500/boards.txt

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ scu: 
	see binding for arm/scu.txt



interrupt-controller:

	see binding for arm/gic.txt

	see binding for interrupt-controller/arm,gic.txt



timer:

	see binding for arm/twd.txt

Documentation/devicetree/bindings/clock/nvidia,tegra124-dfll.txt

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ Required properties for I2C mode: 


Example:



clock@0,70110000 {

clock@70110000 {

        compatible = "nvidia,tegra124-dfll";

        reg = <0 0x70110000 0 0x100>, /* DFLL control */

              <0 0x70110000 0 0x100>, /* I2C output control */