Merge tag 'xfs-4.21-merge-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[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 37826fac76840827698f576f45def6f3455bf34b..389508584f48d36414894f9da0f8e1044ef25593 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -67,6 +67,7 @@ capella       Capella Microsystems, Inc
 cascoda        Cascoda, Ltd.
 cavium Cavium, Inc.
 cdns   Cadence Design Systems Inc.
+cdtech CDTech(H.K.) Electronics Limited
 ceva   Ceva, Inc.
 chipidea       Chipidea, Inc
 chipone                ChipOne
@@ -113,6 +114,7 @@ edt Emerging Display Technologies
 eeti   eGalax_eMPIA Technology Inc
 elan   Elan Microelectronic Corp.
 embest Shenzhen Embest Technology Co., Ltd.
+emlid  Emlid, Ltd.
 emmicro        EM Microelectronic
 emtrion        emtrion GmbH
 endless        Endless Mobile, Inc.
@@ -170,6 +172,7 @@ holtek      Holtek Semiconductor, Inc.
 hwacom HwaCom Systems Inc.
 i2se   I2SE GmbH
 ibm    International Business Machines (IBM)
+icplus IC Plus Corp.
 idt    Integrated Device Technologies, Inc.
 ifi    Ingenieurburo Fur Ic-Technologie (I/F/I)
 ilitek ILI Technology Corporation (ILITEK)
@@ -296,6 +299,7 @@ panasonic   Panasonic Corporation
 parade Parade Technologies Inc.
 pericom        Pericom Technology Inc.
 pervasive      Pervasive Displays, Inc.
+phicomm PHICOMM Co., Ltd.
 phytec PHYTEC Messtechnik GmbH
 picochip       Picochip Ltd
 pine64 Pine64
@@ -303,6 +307,7 @@ pixcir  PIXCIR MICROELECTRONICS Co., Ltd
 plathome       Plat'Home Co., Ltd.
 plda   PLDA
 plx    Broadcom Corporation (formerly PLX Technology)
+pni    PNI Sensor Corporation
 portwell       Portwell Inc.
 poslab Poslab Technology Co., Ltd.
 powervr        PowerVR (deprecated, use img)
@@ -416,6 +421,7 @@ vamrs       Vamrs Ltd.
 variscite      Variscite Ltd.
 via    VIA Technologies, Inc.
 virtio Virtual I/O Device Specification, developed by the OASIS consortium
+vishay Vishay Intertechnology, Inc
 vitesse        Vitesse Semiconductor Corporation
 vivante        Vivante Corporation
 vocore VoCore Studio