Merge tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[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 4dcc3a7..f9fe945 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.
@@ -79,6 +80,7 @@ denx  Denx Software Engineering
 devantech      Devantech, Ltd.
 digi   Digi International Inc.
 digilent       Diglent, Inc.
+dioo   Dioo Microcircuit Co., Ltd
 dlg    Dialog Semiconductor
 dlink  D-Link Corporation
 dmo    Data Modul AG
@@ -102,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
@@ -180,6 +183,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.
@@ -214,6 +218,7 @@ newhaven    Newhaven Display International
 ni     National Instruments
 nintendo       Nintendo
 nokia  Nokia
+nordic Nordic Semiconductor
 nuvoton        Nuvoton Technology Corporation
 nvd    New Vision Display
 nvidia NVIDIA
@@ -260,6 +265,7 @@ richtek     Richtek Technology Corporation
 ricoh  Ricoh Co. Ltd.
 rikomagic      Rikomagic Tech Corp. Ltd
 rockchip       Fuzhou Rockchip Electronics Co., Ltd
+rohm   ROHM Semiconductor Co., Ltd
 samsung        Samsung Semiconductor
 samtec Samtec/Softing company
 sandisk        Sandisk Corporation
@@ -267,6 +273,7 @@ sbs Smart Battery System
 schindler      Schindler
 seagate        Seagate Technology PLC
 semtech        Semtech Corporation
+sensirion      Sensirion AG
 sgx    SGX Sensortech
 sharp  Sharp Corporation
 si-en  Si-En Technology Ltd.
@@ -337,6 +344,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