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

[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 5b8e844..ee55847 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -51,6 +51,7 @@ brcm  Broadcom Corporation
 buffalo        Buffalo, Inc.
 calxeda        Calxeda
 capella        Capella Microsystems, Inc
+cascoda        Cascoda, Ltd.
 cavium Cavium, Inc.
 cdns   Cadence Design Systems Inc.
 ceva   Ceva, Inc.
@@ -103,6 +104,7 @@ ettus       NI Ettus Research
 eukrea  Eukréa Electromatique
 everest        Everest Semiconductor Co. Ltd.
 everspin       Everspin Technologies, Inc.
+exar   Exar Corporation
 excito Excito
 ezchip EZchip Semiconductor
 faraday        Faraday Technology Corporation
@@ -179,6 +181,7 @@ maxim       Maxim Integrated Products
 mcube  mCube
 meas   Measurement Specialties
 mediatek       MediaTek Inc.
+megachips      MegaChips
 melexis        Melexis N.V.
 melfas MELFAS Inc.
 memsic MEMSIC Inc.
@@ -339,6 +342,7 @@ wd  Western Digital Corp.
 wetek  WeTek Electronics, limited.
 wexler Wexler
 winbond Winbond Electronics corp.
+winstar        Winstar Display Corp.
 wlf    Wolfson Microelectronics
 wm     Wondermedia Technologies, Inc.
 x-powers       X-Powers