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

[mirror_ubuntu-artful-kernel.git] / Documentation / devicetree / bindings / vendor-prefixes.txt

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 078834a5fd85b8e5ed560db65e6414925c553f45..6e25c912a5c2611a377d6306e298ca3702aaf84e 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -24,9 +24,11 @@ ampire       Ampire Co., Ltd.
 ams    AMS AG
 amstaos        AMS-Taos Inc.
 analogix       Analogix Semiconductor, Inc.
+andestech      Andes Technology Corporation
 apm    Applied Micro Circuits Corporation (APM)
 aptina Aptina Imaging
 arasan Arasan Chip Systems
+aries  Aries Embedded GmbH
 arm    ARM Ltd.
 armadeus       ARMadeus Systems SARL
 arrow  Arrow Electronics
@@ -161,6 +163,7 @@ lg  LG Corporation
 linux  Linux-specific binding
 lltc   Linear Technology Corporation
 lsi    LSI Corp. (LSI Logic)
+macnica        Macnica Americas
 marvell        Marvell Technology Group Ltd.
 maxim  Maxim Integrated Products
 mcube  mCube
@@ -186,6 +189,7 @@ mti Imagination Technologies Ltd. (formerly MIPS Technologies Inc.)
 mundoreader    Mundo Reader S.L.
 murata Murata Manufacturing Co., Ltd.
 mxicy  Macronix International Co., Ltd.
+myir   MYIR Tech Limited
 national       National Semiconductor
 nec    NEC LCD Technologies, Ltd.
 neonode                Neonode Inc.
@@ -193,13 +197,15 @@ netgear   NETGEAR
 netlogic       Broadcom Corporation (formerly NetLogic Microsystems)
 netxeon                Shenzhen Netxeon Technology CO., LTD
 newhaven       Newhaven Display International
-nvd    New Vision Display
+ni     National Instruments
 nintendo       Nintendo
 nokia  Nokia
 nuvoton        Nuvoton Technology Corporation
+nvd    New Vision Display
 nvidia NVIDIA
 nxp    NXP Semiconductors
 okaya  Okaya Electric America, Inc.
+oki    Oki Electric Industry Co., Ltd.
 olimex OLIMEX Ltd.
 onion  Onion Corporation
 onnn   ON Semiconductor Corp.
@@ -238,6 +244,7 @@ richtek     Richtek Technology Corporation
 ricoh  Ricoh Co. Ltd.
 rockchip       Fuzhou Rockchip Electronics Co., Ltd
 samsung        Samsung Semiconductor
+samtec Samtec/Softing company
 sandisk        Sandisk Corporation
 sbs    Smart Battery System
 schindler      Schindler
@@ -282,6 +289,7 @@ tcg Trusted Computing Group
 tcl    Toby Churchill Ltd.
 technexion     TechNexion
 technologic    Technologic Systems
+terasic        Terasic Inc.
 thine  THine Electronics, Inc.
 ti     Texas Instruments
 tlm    Trusted Logic Mobility
@@ -296,6 +304,7 @@ tronfy      Tronfy
 tronsmart      Tronsmart
 truly  Truly Semiconductors Limited
 tyan   Tyan Computer Corporation
+udoo   Udoo
 uniwest        United Western Technologies Corp (UniWest)
 upisemi        uPI Semiconductor Corp.
 urt    United Radiant Technology Corporation