From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 20 May 2016 21:51:34 +0000 (-0700)
Subject: Merge tag 'devicetree-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/robh... 
X-Git-Tag: v4.7-rc1~100
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=e7f44b65b532040ac90b73b60ea0b629742ced33;p=karo-tx-linux.git

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

e7f44b65b532040ac90b73b60ea0b629742ced33
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index 316412dc7913,aba3a45184fc..32f965807a07
--- a/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 0360919a5737,a1c965cdcfad..e206ce7a4e4b
--- a/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;
  };
  
+ struct arm_smmu_phandle_args {
+ 	struct device_node *np;
+ 	int args_count;
+ 	uint32_t args[MAX_MASTER_STREAMIDS];
+ };
+ 
 -static struct iommu_ops arm_smmu_ops;
 -
  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",