Merge tag 'mips_4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips

[sfrench/cifs-2.6.git] / Documentation / devicetree / bindings / vendor-prefixes.txt

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index f776fb804a8c211fffeda56bab019e8c02c1bd56..ae850d6c0ad3779f2e9fa0f1ba60f49b5b864e8a 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -15,6 +15,7 @@ adi   Analog Devices, Inc.
 advantech      Advantech Corporation
 aeroflexgaisler        Aeroflex Gaisler AB
 al     Annapurna Labs
+allo   Allo.com
 allwinner      Allwinner Technology Co., Ltd.
 alphascale     AlphaScale Integrated Circuits Systems, Inc.
 altr   Altera Corp.
@@ -97,6 +98,7 @@ dptechnics    DPTechnics
 dragino        Dragino Technology Co., Limited
 ea     Embedded Artists AB
 ebv    EBV Elektronik
+eckelmann      Eckelmann AG
 edt    Emerging Display Technologies
 eeti   eGalax_eMPIA Technology Inc
 elan   Elan Microelectronic Corp.
@@ -123,6 +125,7 @@ focaltech   FocalTech Systems Co.,Ltd
 friendlyarm    Guangzhou FriendlyARM Computer Tech Co., Ltd
 fsl    Freescale Semiconductor
 fujitsu        Fujitsu Ltd.
+gcw Game Consoles Worldwide
 ge     General Electric Company
 geekbuying     GeekBuying
 gef    GE Fanuc Intelligent Platforms Embedded Systems, Inc.
@@ -154,6 +157,7 @@ i2se        I2SE GmbH
 ibm    International Business Machines (IBM)
 idt    Integrated Device Technologies, Inc.
 ifi    Ingenieurburo Fur Ic-Technologie (I/F/I)
+ilitek ILI Technology Corporation (ILITEK)
 img    Imagination Technologies Ltd.
 infineon Infineon Technologies
 inforce        Inforce Computing
@@ -172,6 +176,7 @@ itead       ITEAD Intelligent Systems Co.Ltd
 iwave  iWave Systems Technologies Pvt. Ltd.
 jdi    Japan Display Inc.
 jedec  JEDEC Solid State Technology Association
+jianda Jiandangjing Technology Co., Ltd.
 karo   Ka-Ro electronics GmbH
 keithkoep      Keith & Koep GmbH
 keymile        Keymile GmbH
@@ -305,6 +310,7 @@ seagate     Seagate Technology PLC
 semtech        Semtech Corporation
 sensirion      Sensirion AG
 sff    Small Form Factor Committee
+sgd    Solomon Goldentek Display Corporation
 sgx    SGX Sensortech
 sharp  Sharp Corporation
 shimafuji      Shimafuji Electric, Inc.
@@ -380,6 +386,7 @@ virtio      Virtual I/O Device Specification, developed by the OASIS consortium
 vivante        Vivante Corporation
 vocore VoCore Studio
 voipac Voipac Technologies s.r.o.
+vot    Vision Optical Technology Co., Ltd.
 wd     Western Digital Corp.
 wetek  WeTek Electronics, limited.
 wexler Wexler