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 7075698abd8c05aca2112992319197d2cce0e729..cba613f8aa4f351af7c807fb5115d14c4a847672 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -4,6 +4,7 @@ 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.
@@ -36,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.
@@ -160,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