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

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
  ...

diff --cc Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt
Simple merge

diff --cc Documentation/devicetree/bindings/net/stmmac.txt
Simple merge

diff --cc Documentation/devicetree/bindings/pinctrl/nvidia,tegra124-xusb-padctl.txt
Simple merge

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index 316412dc79135a472886a331caa9ff4a22932bfe,aba3a45184fc0e8008281cd6b37351c781fcc613..32f965807a07e42d0c1f47d2f7e6da7eceb5972c
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -28,9 -27,9 +28,10 @@@ aptina       Aptina Imagin
  arasan        Arasan Chip Systems
  arm   ARM Ltd.
  armadeus      ARMadeus Systems SARL
+ arrow Arrow Electronics
  artesyn       Artesyn Embedded Technologies Inc.
  asahi-kasei   Asahi Kasei Corp.
 +aspeed        ASPEED Technology Inc.
  atlas Atlas Scientific LLC
  atmel Atmel Corporation
  auo   AU Optronics Corporation

diff --cc drivers/iommu/arm-smmu.c
index 0360919a5737afcdcca8d741b93f4cd087ac4a59,a1c965cdcfade905901d16b8984e69182e881896..e206ce7a4e4bdb7ed2fb1a7d60dd1ea90e15cb0c
--- 1/drivers/iommu/arm-smmu.c
--- 2/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@@ -397,6 -357,14 +397,12 @@@ struct arm_smmu_domain 
        struct iommu_domain             domain;
  };
  
 -static struct iommu_ops arm_smmu_ops;
 -
+ struct arm_smmu_phandle_args {
+       struct device_node *np;
+       int args_count;
+       uint32_t args[MAX_MASTER_STREAMIDS];
+ };
+ 
  static DEFINE_SPINLOCK(arm_smmu_devices_lock);
  static LIST_HEAD(arm_smmu_devices);
  
@@@ -1950,11 -1829,14 +1969,14 @@@ static int arm_smmu_device_dt_probe(str
  
                i++;
        }
+ 
        dev_notice(dev, "registered %d master devices\n", i);
  
+       kfree(masterspec);
+ 
        parse_driver_options(smmu);
  
 -      if (smmu->version > ARM_SMMU_V1 &&
 +      if (smmu->version == ARM_SMMU_V2 &&
            smmu->num_context_banks != smmu->num_context_irqs) {
                dev_err(dev,
                        "found only %d context interrupt(s) but %d required\n",

diff --cc drivers/of/base.c
Simple merge

diff --cc drivers/of/unittest.c
Simple merge

diff --cc include/linux/of.h
Simple merge