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

[firefly-linux-kernel-4.4.55.git] / Documentation / devicetree / bindings / vendor-prefixes.txt

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 71259df60e9650c887ce0d68b599b02c7ed09a6a..f67e3f84e8bc45077c51f68766eceba16215857f 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -46,6 +46,7 @@ dmo   Data Modul AG
 ebv    EBV Elektronik
 edt    Emerging Display Technologies
 emmicro        EM Microelectronic
+energymicro    Silicon Laboratories (formerly Energy Micro AS)
 epcos  EPCOS AG
 epfl   Ecole Polytechnique Fédérale de Lausanne
 epson  Seiko Epson Corp.
@@ -62,6 +63,7 @@ globalscale   Globalscale Technologies, Inc.
 gmt    Global Mixed-mode Technology, Inc.
 google Google, Inc.
 gumstix        Gumstix, Inc.
+gw     Gateworks Corporation
 haoyu  Haoyu Microelectronic Co. Ltd.
 hisilicon      Hisilicon Limited.
 honeywell      Honeywell
@@ -71,6 +73,7 @@ ibm   International Business Machines (IBM)
 idt    Integrated Device Technologies, Inc.
 iom    Iomega Corporation
 img    Imagination Technologies Ltd.
+innolux        Innolux Corporation
 intel  Intel Corporation
 intercontrol   Inter Control Group
 isee   ISEE 2007 S.L.
@@ -132,6 +135,7 @@ simtek
 sii    Seiko Instruments, Inc.
 silergy        Silergy Corp.
 sirf   SiRF Technology, Inc.
+sitronix       Sitronix Technology Corporation
 smsc   Standard Microsystems Corporation
 snps   Synopsys, Inc.
 solidrun       SolidRun