Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[cascardo/linux.git] / Documentation / devicetree / bindings / vendor-prefixes.txt

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 4454483..a7440bc 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -23,6 +23,7 @@ amlogic       Amlogic, Inc.
 ampire Ampire Co., Ltd.
 ams    AMS AG
 amstaos        AMS-Taos Inc.
+analogix       Analogix Semiconductor, Inc.
 apm    Applied Micro Circuits Corporation (APM)
 aptina Aptina Imaging
 arasan Arasan Chip Systems
@@ -185,6 +186,7 @@ okaya       Okaya Electric America, Inc.
 olimex OLIMEX Ltd.
 onion  Onion Corporation
 onnn   ON Semiconductor Corp.
+ontat  On Tat Industrial Company
 opencores      OpenCores.org
 option Option NV
 ortustech      Ortus Technology Co., Ltd.
@@ -261,6 +263,7 @@ toradex     Toradex AG
 toshiba        Toshiba Corporation
 toumaz Toumaz
 tplink TP-LINK Technologies Co., Ltd.
+tpk    TPK U.S.A. LLC
 tronfy Tronfy
 tronsmart      Tronsmart
 truly  Truly Semiconductors Limited