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

[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 cfb590f9849cacfe49c572738387fca8dab275e8..8162b0eb4b5063971f790c52dc8ac7c0857654cd 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -24,6 +24,7 @@ amarula       Amarula Solutions
 amazon Amazon.com, Inc.
 amcc   Applied Micro Circuits Corporation (APM, formally AMCC)
 amd    Advanced Micro Devices (AMD), Inc.
+amediatech     Shenzhen Amediatech Technology Co., Ltd
 amlogic        Amlogic, Inc.
 ampire Ampire Co., Ltd.
 ams    AMS AG
@@ -65,6 +66,7 @@ bticino Bticino International
 calxeda        Calxeda
 capella        Capella Microsystems, Inc
 cascoda        Cascoda, Ltd.
+catalyst       Catalyst Semiconductor, Inc.
 cavium Cavium, Inc.
 cdns   Cadence Design Systems Inc.
 cdtech CDTech(H.K.) Electronics Limited
@@ -108,11 +110,13 @@ dongwoon  Dongwoon Anatech
 dptechnics     DPTechnics
 dragino        Dragino Technology Co., Limited
 ea     Embedded Artists AB
+ebs-systart EBS-SYSTART GmbH
 ebv    EBV Elektronik
 eckelmann      Eckelmann AG
 edt    Emerging Display Technologies
 eeti   eGalax_eMPIA Technology Inc
 elan   Elan Microelectronic Corp.
+elgin  Elgin S/A.
 embest Shenzhen Embest Technology Co., Ltd.
 emlid  Emlid, Ltd.
 emmicro        EM Microelectronic
@@ -142,6 +146,7 @@ focaltech   FocalTech Systems Co.,Ltd
 friendlyarm    Guangzhou FriendlyARM Computer Tech Co., Ltd
 fsl    Freescale Semiconductor
 fujitsu        Fujitsu Ltd.
+gateworks      Gateworks Corporation
 gcw Game Consoles Worldwide
 ge     General Electric Company
 geekbuying     GeekBuying
@@ -151,6 +156,7 @@ geniatech   Geniatech, Inc.
 giantec        Giantec Semiconductor, Inc.
 giantplus      Giantplus Technology Co., Ltd.
 globalscale    Globalscale Technologies, Inc.
+globaltop      GlobalTop Technology, Inc.
 gmt    Global Mixed-mode Technology, Inc.
 goodix Shenzhen Huiding Technology Co., Ltd.
 google Google, Inc.
@@ -212,6 +218,7 @@ laird       Laird PLC
 lantiq Lantiq Semiconductor
 lattice        Lattice Semiconductor
 lego   LEGO Systems A/S
+lemaker        Shenzhen LeMaker Technology Co., Ltd.
 lenovo Lenovo Group Ltd.
 lg     LG Corporation
 libretech      Shenzhen Libre Technology Co., Ltd
@@ -274,6 +281,7 @@ nintendo    Nintendo
 nlt    NLT Technologies, Ltd.
 nokia  Nokia
 nordic Nordic Semiconductor
+novtech NovTech, Inc.
 nutsboard      NutsBoard
 nuvoton        Nuvoton Technology Corporation
 nvd    New Vision Display
@@ -298,6 +306,7 @@ ovti        OmniVision Technologies
 oxsemi Oxford Semiconductor, Ltd.
 panasonic      Panasonic Corporation
 parade Parade Technologies Inc.
+pda    Precision Design Associates, Inc.
 pericom        Pericom Technology Inc.
 pervasive      Pervasive Displays, Inc.
 phicomm PHICOMM Co., Ltd.
@@ -305,6 +314,7 @@ phytec      PHYTEC Messtechnik GmbH
 picochip       Picochip Ltd
 pine64 Pine64
 pixcir  PIXCIR MICROELECTRONICS Co., Ltd
+plantower Plantower Co., Ltd
 plathome       Plat'Home Co., Ltd.
 plda   PLDA
 plx    Broadcom Corporation (formerly PLX Technology)
@@ -432,6 +442,7 @@ vot Vision Optical Technology Co., Ltd.
 wd     Western Digital Corp.
 wetek  WeTek Electronics, limited.
 wexler Wexler
+whwave  Shenzhen whwave Electronics, Inc.
 wi2wi  Wi2Wi, Inc.
 winbond Winbond Electronics corp.
 winstar        Winstar Display Corp.