Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

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

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index e0e216002efd47511ecf97c1660a231aafa0f192..e9034a6c003a6cf43ec4e4b932418eb790ea88fa 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -56,6 +56,7 @@ avnet Avnet, Inc.
 axentia        Axentia Technologies AB
 axis   Axis Communications AB
 azoteq Azoteq (Pty) Ltd
+azw     Shenzhen AZW Technology Co., Ltd.
 bananapi BIPAI KEJI LIMITED
 bhf    Beckhoff Automation GmbH & Co. KG
 bitmain        Bitmain Technologies
@@ -213,6 +214,7 @@ kinetic Kinetic Technologies
 kingdisplay    King & Display Technology Co., Ltd.
 kingnovel      Kingnovel Technology Co., Ltd.
 kionix Kionix, Inc.
+kobo   Rakuten Kobo Inc.
 koe    Kaohsiung Opto-Electronics Inc.
 kosagi Sutajio Ko-Usagi PTE Ltd.
 kyo    Kyocera Corporation
@@ -248,6 +250,7 @@ melexis     Melexis N.V.
 melfas MELFAS Inc.
 mellanox       Mellanox Technologies
 memsic MEMSIC Inc.
+menlo  Menlo Systems GmbH
 merrii Merrii Technology Co., Ltd.
 micrel Micrel Inc.
 microchip      Microchip Technology Inc.
@@ -291,6 +294,7 @@ nuvoton     Nuvoton Technology Corporation
 nvd    New Vision Display
 nvidia NVIDIA
 nxp    NXP Semiconductors
+oceanic        Oceanic Systems (UK) Ltd.
 okaya  Okaya Electric America, Inc.
 oki    Oki Electric Industry Co., Ltd.
 olimex OLIMEX Ltd.
@@ -360,6 +364,7 @@ sandisk     Sandisk Corporation
 sbs    Smart Battery System
 schindler      Schindler
 seagate        Seagate Technology PLC
+seirobotics    Shenzhen SEI Robotics Co., Ltd
 semtech        Semtech Corporation
 sensirion      Sensirion AG
 sff    Small Form Factor Committee
@@ -368,6 +373,7 @@ sgx SGX Sensortech
 sharp  Sharp Corporation
 shimafuji      Shimafuji Electric, Inc.
 si-en  Si-En Technology Ltd.
+si-linux       Silicon Linux Corporation
 sifive SiFive, Inc.
 sigma  Sigma Designs, Inc.
 sii    Seiko Instruments, Inc.
@@ -422,6 +428,7 @@ toumaz      Toumaz
 tpk    TPK U.S.A. LLC
 tplink TP-LINK Technologies Co., Ltd.
 tpo    TPO
+tq     TQ Systems GmbH
 tronfy Tronfy
 tronsmart      Tronsmart
 truly  Truly Semiconductors Limited