Merge tag 'devicetree-for-4.11' 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 16d3b5e..1d0bb2c 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -40,6 +40,7 @@ atmel Atmel Corporation
 auo    AU Optronics Corporation
 auvidea Auvidea GmbH
 avago  Avago Technologies
+avia   avia semiconductor
 avic   Shanghai AVIC Optoelectronics Co., Ltd.
 axentia        Axentia Technologies AB
 axis   Axis Communications AB
@@ -75,6 +76,7 @@ dallas        Maxim Integrated Products (formerly Dallas Semiconductor)
 davicom        DAVICOM Semiconductor, Inc.
 delta  Delta Electronics, Inc.
 denx   Denx Software Engineering
+devantech      Devantech, Ltd.
 digi   Digi International Inc.
 digilent       Diglent, Inc.
 dlg    Dialog Semiconductor
@@ -102,11 +104,13 @@ everest   Everest Semiconductor Co. Ltd.
 everspin       Everspin Technologies, Inc.
 excito Excito
 ezchip EZchip Semiconductor
+faraday        Faraday Technology Corporation
 fcs    Fairchild Semiconductor
 firefly        Firefly
 focaltech      FocalTech Systems Co.,Ltd
 friendlyarm    Guangzhou FriendlyARM Computer Tech Co., Ltd
 fsl    Freescale Semiconductor
+fujitsu        Fujitsu Ltd.
 ge     General Electric Company
 geekbuying     GeekBuying
 gef    GE Fanuc Intelligent Platforms Embedded Systems, Inc.
@@ -118,6 +122,7 @@ gmt Global Mixed-mode Technology, Inc.
 goodix Shenzhen Huiding Technology Co., Ltd.
 google Google, Inc.
 grinn  Grinn
+grmn   Garmin Limited
 gumstix        Gumstix, Inc.
 gw     Gateworks Corporation
 hannstar       HannStar Display Corporation