Merge tag 'iio-for-4.21a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23...

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

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 1c2cd46..3cfe0c8 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -84,6 +84,7 @@ cosmic        Cosmic Circuits
 crane  Crane Connectivity Solutions
 creative       Creative Technology Ltd
 crystalfontz   Crystalfontz America, Inc.
+csky   Hangzhou C-SKY Microsystems Co., Ltd
 cubietech      Cubietech, Ltd.
 cypress        Cypress Semiconductor Corporation
 cznic  CZ.NIC, z.s.p.o.
@@ -114,6 +115,7 @@ elan        Elan Microelectronic Corp.
 embest Shenzhen Embest Technology Co., Ltd.
 emmicro        EM Microelectronic
 emtrion        emtrion GmbH
+endless        Endless Mobile, Inc.
 energymicro    Silicon Laboratories (formerly Energy Micro AS)
 engicam        Engicam S.r.l.
 epcos  EPCOS AG
@@ -127,6 +129,7 @@ everspin    Everspin Technologies, Inc.
 exar   Exar Corporation
 excito Excito
 ezchip EZchip Semiconductor
+facebook       Facebook
 fairphone      Fairphone B.V.
 faraday        Faraday Technology Corporation
 fastrax        Fastrax Oy
@@ -235,6 +238,7 @@ micrel      Micrel Inc.
 microchip      Microchip Technology Inc.
 microcrystal   Micro Crystal AG
 micron Micron Technology Inc.
+mikroe         MikroElektronika d.o.o.
 minix  MINIX Technology Ltd.
 miramems       MiraMEMS Sensing Technology Co., Ltd.
 mitsubishi     Mitsubishi Electric Corporation
@@ -274,6 +278,7 @@ nxp NXP Semiconductors
 okaya  Okaya Electric America, Inc.
 oki    Oki Electric Industry Co., Ltd.
 olimex OLIMEX Ltd.
+olpc   One Laptop Per Child
 onion  Onion Corporation
 onnn   ON Semiconductor Corp.
 ontat  On Tat Industrial Company
@@ -297,7 +302,8 @@ pine64      Pine64
 pixcir  PIXCIR MICROELECTRONICS Co., Ltd
 plathome       Plat'Home Co., Ltd.
 plda   PLDA
-pni     PNI Sensor Corporation
+plx    Broadcom Corporation (formerly PLX Technology)
+pni    PNI Sensor Corporation
 portwell       Portwell Inc.
 poslab Poslab Technology Co., Ltd.
 powervr        PowerVR (deprecated, use img)