Merge tag 'dm-3.16-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device...

[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 abc308083acb204c7625c5d53ed58d546c65f755..4d7f3758d1b43fd1c4e938e27bd0525f667025d7 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -13,6 +13,7 @@ allwinner     Allwinner Technology Co., Ltd.
 altr   Altera Corp.
 amcc   Applied Micro Circuits Corporation (APM, formally AMCC)
 amd    Advanced Micro Devices (AMD), Inc.
+ams    AMS AG
 amstaos        AMS-Taos Inc.
 apm    Applied Micro Circuits Corporation (APM)
 arm    ARM Ltd.
@@ -73,12 +74,15 @@ lantiq      Lantiq Semiconductor
 lg     LG Corporation
 linux  Linux-specific binding
 lsi    LSI Corp. (LSI Logic)
+lltc   Linear Technology Corporation
 marvell        Marvell Technology Group Ltd.
 maxim  Maxim Integrated Products
+micrel Micrel Inc.
 microchip      Microchip Technology Inc.
 mosaixtech     Mosaix Technologies, Inc.
 moxa   Moxa
 mpl    MPL AG
+mundoreader    Mundo Reader S.L.
 mxicy  Macronix International Co., Ltd.
 national       National Semiconductor
 neonode                Neonode Inc.
@@ -98,6 +102,7 @@ powervr      PowerVR (deprecated, use img)
 qca    Qualcomm Atheros, Inc.
 qcom   Qualcomm Technologies, Inc
 qnap   QNAP Systems, Inc.
+radxa  Radxa
 raidsonic      RaidSonic Technology GmbH
 ralink Mediatek/Ralink Technology Corp.
 ramtron        Ramtron International
@@ -123,10 +128,12 @@ stericsson        ST-Ericsson
 synology       Synology, Inc.
 ti     Texas Instruments
 tlm    Trusted Logic Mobility
+toradex        Toradex AG
 toshiba        Toshiba Corporation
 toumaz Toumaz
 usi    Universal Scientifc Industrial Co., Ltd.
 v3     V3 Semiconductor
+variscite      Variscite Ltd.
 via    VIA Technologies, Inc.
 voipac Voipac Technologies s.r.o.
 winbond Winbond Electronics corp.
@@ -135,3 +142,4 @@ wm  Wondermedia Technologies, Inc.
 xes    Extreme Engineering Solutions (X-ES)
 xlnx   Xilinx
 zyxel  ZyXEL Communications Corp.
+zarlink        Zarlink Semiconductor