From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 Jul 2015 02:40:18 +0000 (-0700)
Subject: Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.14-rc1~5119
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4da3064d1775810f10f7ddc1c34c3f1ff502a654;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'devicetree-for-linus' of git://git./linux/kernel/git/glikely/linux

Pull devicetree updates from Grant Likely:
 "A whole lot of bug fixes.

  Nothing stands out here except the ability to enable CONFIG_OF on
  every architecture, and an import of a newer version of dtc"

* tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux: (22 commits)
  of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh
  of/irq: Fix pSeries boot failure
  Documentation: DT: Fix a typo in the filename "lantiq,<chip>-pinumx.txt"
  of: define of_find_node_by_phandle for !CONFIG_OF
  of/address: use atomic allocation in pci_register_io_range()
  of: Add vendor prefix for Zodiac Inflight Innovations
  dt/fdt: add empty versions of early_init_dt_*_memory_arch
  of: clean-up unnecessary libfdt include paths
  of: make unittest select OF_EARLY_FLATTREE instead of depend on it
  of: make CONFIG_OF user selectable
  MIPS: prepare for user enabling of CONFIG_OF
  of/fdt: fix argument name and add comments of unflatten_dt_node()
  of: return NUMA_NO_NODE from fallback of_node_to_nid()
  tps6507x.txt: Remove executable permission
  of/overlay: Grammar s/an negative/a negative/
  of/fdt: Make fdt blob input parameters of unflatten functions const
  of: add helper function to retrive match data
  of: Grammar s/property exist/property exists/
  of: Move OF flags to be visible even when !CONFIG_OF
  scripts/dtc: Update to upstream version 9d3649bd3be245c9
  ...
---

4da3064d1775810f10f7ddc1c34c3f1ff502a654
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index 347c8fd,c400c95..d444757
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -227,4 -211,4 +227,5 @@@ xillybus	Xillybus Ltd
  xlnx	Xilinx
  zyxel	ZyXEL Communications Corp.
  zarlink	Zarlink Semiconductor
+ zii	Zodiac Inflight Innovations
 +zte	ZTE Corp.
diff --cc include/linux/of.h
index f05fdce,2507617..edc068d
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@@ -120,9 -120,13 +120,15 @@@ extern struct device_node *of_aliases
  extern struct device_node *of_stdout;
  extern raw_spinlock_t devtree_lock;
  
+ /* flag descriptions (need to be visible even when !CONFIG_OF) */
+ #define OF_DYNAMIC	1 /* node and properties were allocated via kmalloc */
+ #define OF_DETACHED	2 /* node has been detached from the device tree */
+ #define OF_POPULATED	3 /* device already created for the node */
+ #define OF_POPULATED_BUS	4 /* of_platform_populate recursed to children of this node */
+ 
  #ifdef CONFIG_OF
 +void of_core_init(void);
 +
  static inline bool is_of_node(struct fwnode_handle *fwnode)
  {
  	return fwnode && fwnode->type == FWNODE_OF;