Merge tag 'tty-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[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 d443279c95dca76539d60e3c55ce3f9f54d61478..cba613f8aa4f351af7c807fb5115d14c4a847672 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -4,9 +4,11 @@ This isn't an exhaustive list, but you should add new prefixes to it before
 using them to avoid name-space collisions.
 
 abilis Abilis Systems
+abcn   Abracon Corporation
 active-semi    Active-Semi International Inc
 ad     Avionic Design GmbH
 adapteva       Adapteva, Inc.
+adh    AD Holdings Plc.
 adi    Analog Devices, Inc.
 aeroflexgaisler        Aeroflex Gaisler AB
 allwinner      Allwinner Technology Co., Ltd.
@@ -35,7 +37,9 @@ chrp  Common Hardware Reference Platform
 chunghwa       Chunghwa Picture Tubes Ltd.
 cirrus Cirrus Logic, Inc.
 cnm    Chips&Media, Inc.
+cnxt   Conexant Systems, Inc.
 cortina        Cortina Systems, Inc.
+cosmic Cosmic Circuits
 crystalfontz   Crystalfontz America, Inc.
 dallas Maxim Integrated Products (formerly Dallas Semiconductor)
 davicom        DAVICOM Semiconductor, Inc.
@@ -54,8 +58,10 @@ epcos        EPCOS AG
 epfl   Ecole Polytechnique Fédérale de Lausanne
 epson  Seiko Epson Corp.
 est    ESTeem Wireless Modems
+ettus  NI Ettus Research
 eukrea  Eukréa Electromatique
 everest        Everest Semiconductor Co. Ltd.
+everspin       Everspin Technologies, Inc.
 excito Excito
 fcs    Fairchild Semiconductor
 fsl    Freescale Semiconductor
@@ -69,6 +75,7 @@ gumstix       Gumstix, Inc.
 gw     Gateworks Corporation
 hannstar       HannStar Display Corporation
 haoyu  Haoyu Microelectronic Co. Ltd.
+himax  Himax Technologies, Inc.
 hisilicon      Hisilicon Limited.
 hit    Hitachi Ltd.
 honeywell      Honeywell
@@ -82,8 +89,7 @@ innolux       Innolux Corporation
 intel  Intel Corporation
 intercontrol   Inter Control Group
 isee   ISEE 2007 S.L.
-isil    Intersil (deprecated, use isl)
-isl    Intersil
+isil   Intersil
 karo   Ka-Ro electronics GmbH
 keymile        Keymile GmbH
 lacie  LaCie
@@ -118,6 +124,7 @@ nvidia      NVIDIA
 nxp    NXP Semiconductors
 onnn   ON Semiconductor Corp.
 opencores      OpenCores.org
+ovti   OmniVision Technologies
 panasonic      Panasonic Corporation
 pericom        Pericom Technology Inc.
 phytec PHYTEC Messtechnik GmbH
@@ -142,8 +149,10 @@ sandisk    Sandisk Corporation
 sbs    Smart Battery System
 schindler      Schindler
 seagate        Seagate Technology PLC
+semtech        Semtech Corporation
 sil    Silicon Image
 silabs Silicon Laboratories
+siliconmitus   Silicon Mitus, Inc.
 simtek
 sii    Seiko Instruments, Inc.
 silergy        Silergy Corp.
@@ -154,6 +163,7 @@ snps        Synopsys, Inc.
 solidrun       SolidRun
 sony   Sony Corporation
 spansion       Spansion Inc.
+sprd   Spreadtrum Communications Inc.
 st     STMicroelectronics
 ste    ST-Ericsson
 stericsson     ST-Ericsson
@@ -165,6 +175,7 @@ tlm Trusted Logic Mobility
 toradex        Toradex AG
 toshiba        Toshiba Corporation
 toumaz Toumaz
+truly  Truly Semiconductors Limited
 usi    Universal Scientific Industrial Co., Ltd.
 v3     V3 Semiconductor
 variscite      Variscite Ltd.