Merge tag 'arc-4.10-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupt...

[linux-2.6-block.git] / Documentation / devicetree / bindings / vendor-prefixes.txt

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 98371753a08f4f1866f9eb07206129b3c7ebd385..16d3b5e7f5d1f52d1bf3c5f98220ba4f09b99b8f 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
@@ -68,6 +70,7 @@ creative      Creative Technology Ltd
 crystalfontz   Crystalfontz America, Inc.
 cubietech      Cubietech, Ltd.
 cypress        Cypress Semiconductor Corporation
+cznic  CZ.NIC, z.s.p.o.
 dallas Maxim Integrated Products (formerly Dallas Semiconductor)
 davicom        DAVICOM Semiconductor, Inc.
 delta  Delta Electronics, Inc.
@@ -137,6 +140,7 @@ infineon Infineon Technologies
 inforce        Inforce Computing
 ingenic        Ingenic Semiconductor
 innolux        Innolux Corporation
+inside-secure  INSIDE Secure
 intel  Intel Corporation
 intercontrol   Inter Control Group
 invensense     InvenSense Inc.
@@ -160,6 +164,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
@@ -185,20 +190,24 @@ 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.
 netgear        NETGEAR
 netlogic       Broadcom Corporation (formerly NetLogic Microsystems)
 netxeon                Shenzhen Netxeon Technology CO., LTD
+nexbox Nexbox
 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.
@@ -214,6 +223,7 @@ parade      Parade Technologies Inc.
 pericom        Pericom Technology Inc.
 phytec PHYTEC Messtechnik GmbH
 picochip       Picochip Ltd
+pine64 Pine64
 pixcir  PIXCIR MICROELECTRONICS Co., Ltd
 plathome       Plat'Home Co., Ltd.
 plda   PLDA
@@ -235,8 +245,10 @@ realtek Realtek Semiconductor Corp.
 renesas        Renesas Electronics Corporation
 richtek        Richtek Technology Corporation
 ricoh  Ricoh Co. Ltd.
+rikomagic      Rikomagic Tech Corp. Ltd
 rockchip       Fuzhou Rockchip Electronics Co., Ltd
 samsung        Samsung Semiconductor
+samtec Samtec/Softing company
 sandisk        Sandisk Corporation
 sbs    Smart Battery System
 schindler      Schindler
@@ -281,6 +293,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
@@ -295,6 +308,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