From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Feb 2015 16:58:43 +0000 (-0800)
Subject: Merge tag 'devicetree-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cdd305454ebd181fa35b648c0921fe7df27d6f3b;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge tag 'devicetree-for-3.20' of git://git./linux/kernel/git/robh/linux

Pull DeviceTree changes from Rob Herring:

 - DT unittests for I2C probing and overlays from Pantelis Antoniou

 - Remove DT unittest dependency on OF_DYNAMIC from Gaurav Minocha

 - Add Tegra compatible strings missing for newer parts from Paul
   Walmsley

 - Various vendor prefix additions

* tag 'devicetree-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  of: Add vendor prefix for OmniVision Technologies
  of: Use ovti for Omnivision
  of: Add vendor prefix for Truly Semiconductors Limited
  of: Add vendor prefix for Himax Technologies Inc.
  of/fdt: fix sparse warning
  of: unitest: Add I2C overlay unit tests.
  Documentation: DT: document compatible string existence requirement
  Documentation: DT bindings: add nvidia, tegra132-denver compatible string
  Documentation: DT bindings: add more Tegra chip compatible strings
  of: EXPORT_SYMBOL_GPL of_property_read_u64_array
  of: Fix brace position for struct of_device_id definition
  of/unittest: Remove obsolete code
  dt-bindings: use isil prefix for Intersil in vendor-prefixes.txt
  Add AD Holdings Plc. to vendor-prefixes.
  dt-bindings: Add Silicon Mitus vendor prefix
  Removes OF_UNITTEST dependency on OF_DYNAMIC config symbol
  pinctrl: fix up device tree bindings
  DT: Vendors: Add Everspin
  doc: add bindings document for altera fpga manager
  drivers: of: Export of_reserved_mem_device_{init,release}
---

cdd305454ebd181fa35b648c0921fe7df27d6f3b
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index e344fa2f6c4d,c2a48ff38f74..7075698abd8c
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -54,9 -55,9 +55,10 @@@ epcos	EPCOS A
  epfl	Ecole Polytechnique Fédérale de Lausanne
  epson	Seiko Epson Corp.
  est	ESTeem Wireless Modems
 +ettus	NI Ettus Research
  eukrea  Eukréa Electromatique
  everest	Everest Semiconductor Co. Ltd.
+ everspin	Everspin Technologies, Inc.
  excito	Excito
  fcs	Fairchild Semiconductor
  fsl	Freescale Semiconductor
@@@ -143,9 -145,9 +146,10 @@@ sandisk	Sandisk Corporatio
  sbs	Smart Battery System
  schindler	Schindler
  seagate	Seagate Technology PLC
 +semtech	Semtech Corporation
  sil	Silicon Image
  silabs	Silicon Laboratories
+ siliconmitus	Silicon Mitus, Inc.
  simtek
  sii	Seiko Instruments, Inc.
  silergy	Silergy Corp.