Merge remote-tracking branch 'userns/for-next'

[karo-tx-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 68747d979623173e792ed41ef7864be69011bc73..55df1d444e9f82c150ef144c02357d13169ead31 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -52,6 +52,7 @@ cirrus        Cirrus Logic, Inc.
 cloudengines   Cloud Engines, Inc.
 cnm    Chips&Media, Inc.
 cnxt   Conexant Systems, Inc.
+compulab       CompuLab Ltd.
 cortina        Cortina Systems, Inc.
 cosmic Cosmic Circuits
 crystalfontz   Crystalfontz America, Inc.
@@ -103,6 +104,7 @@ himax       Himax Technologies, Inc.
 hisilicon      Hisilicon Limited.
 hit    Hitachi Ltd.
 hitex  Hitex Development Tools
+holt   Holt Integrated Circuits, Inc.
 honeywell      Honeywell
 hp     Hewlett Packard
 i2se   I2SE GmbH
@@ -172,6 +174,7 @@ picochip    Picochip Ltd
 plathome       Plat'Home Co., Ltd.
 plda   PLDA
 pixcir  PIXCIR MICROELECTRONICS Co., Ltd
+pulsedlight    PulsedLight, Inc
 powervr        PowerVR (deprecated, use img)
 qca    Qualcomm Atheros, Inc.
 qcom   Qualcomm Technologies, Inc
@@ -194,7 +197,9 @@ sbs Smart Battery System
 schindler      Schindler
 seagate        Seagate Technology PLC
 semtech        Semtech Corporation
+sgx    SGX Sensortech
 sharp  Sharp Corporation
+sigma  Sigma Designs, Inc.
 sil    Silicon Image
 silabs Silicon Laboratories
 siliconmitus   Silicon Mitus, Inc.
@@ -227,6 +232,7 @@ toumaz      Toumaz
 tplink TP-LINK Technologies Co., Ltd.
 tronfy Tronfy
 truly  Truly Semiconductors Limited
+upisemi        uPI Semiconductor Corp.
 usi    Universal Scientific Industrial Co., Ltd.
 v3     V3 Semiconductor
 variscite      Variscite Ltd.