Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[firefly-linux-kernel-4.4.55.git] / Documentation / devicetree / bindings / vendor-prefixes.txt

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 88536391916b572ae5426eac2903368e215a1ff9..cc6151c431c86ba1510a5404c3135ce8a03e301e 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -41,6 +41,7 @@ dallas        Maxim Integrated Products (formerly Dallas Semiconductor)
 davicom        DAVICOM Semiconductor, Inc.
 denx   Denx Software Engineering
 digi   Digi International Inc.
+digilent       Diglent, Inc.
 dlg    Dialog Semiconductor
 dlink  D-Link Corporation
 dmo    Data Modul AG
@@ -78,6 +79,7 @@ innolux       Innolux Corporation
 intel  Intel Corporation
 intercontrol   Inter Control Group
 isee   ISEE 2007 S.L.
+isil    Intersil (deprecated, use isl)
 isl    Intersil
 karo   Ka-Ro electronics GmbH
 keymile        Keymile GmbH
@@ -91,6 +93,7 @@ lltc  Linear Technology Corporation
 marvell        Marvell Technology Group Ltd.
 maxim  Maxim Integrated Products
 mediatek       MediaTek Inc.
+merrii Merrii Technology Co., Ltd.
 micrel Micrel Inc.
 microchip      Microchip Technology Inc.
 micron Micron Technology Inc.
@@ -113,6 +116,7 @@ nxp NXP Semiconductors
 onnn   ON Semiconductor Corp.
 opencores      OpenCores.org
 panasonic      Panasonic Corporation
+pericom        Pericom Technology Inc.
 phytec PHYTEC Messtechnik GmbH
 picochip       Picochip Ltd
 plathome       Plat'Home Co., Ltd.
@@ -150,6 +154,7 @@ st  STMicroelectronics
 ste    ST-Ericsson
 stericsson     ST-Ericsson
 synology       Synology, Inc.
+tbs    TBS Technologies
 thine  THine Electronics, Inc.
 ti     Texas Instruments
 tlm    Trusted Logic Mobility