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

[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 dbfe839c201a81060311e6b233ec790144880638..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.
 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.
 cortina        Cortina Systems, Inc.
 cosmic Cosmic Circuits
 crystalfontz   Crystalfontz America, Inc.


@@ -83,6 +84,7 @@ everspin      Everspin Technologies, Inc.
 excito Excito
 fcs    Fairchild Semiconductor
 firefly        Firefly
 excito Excito
 fcs    Fairchild Semiconductor
 firefly        Firefly

+focaltech      FocalTech Systems Co.,Ltd

 fsl    Freescale Semiconductor
 GEFanuc        GE Fanuc Intelligent Platforms Embedded Systems, Inc.
 gef    GE Fanuc Intelligent Platforms Embedded Systems, Inc.
 fsl    Freescale Semiconductor
 GEFanuc        GE Fanuc Intelligent Platforms Embedded Systems, Inc.
 gef    GE Fanuc Intelligent Platforms Embedded Systems, Inc.


@@ -102,6 +104,7 @@ himax       Himax Technologies, Inc.
 hisilicon      Hisilicon Limited.
 hit    Hitachi Ltd.
 hitex  Hitex Development Tools
 hisilicon      Hisilicon Limited.
 hit    Hitachi Ltd.
 hitex  Hitex Development Tools

+holt   Holt Integrated Circuits, Inc.

 honeywell      Honeywell
 hp     Hewlett Packard
 i2se   I2SE GmbH
 honeywell      Honeywell
 hp     Hewlett Packard
 i2se   I2SE GmbH


@@ -169,7 +172,9 @@ pericom     Pericom Technology Inc.
 phytec PHYTEC Messtechnik GmbH
 picochip       Picochip Ltd
 plathome       Plat'Home Co., Ltd.
 phytec PHYTEC Messtechnik GmbH
 picochip       Picochip Ltd
 plathome       Plat'Home Co., Ltd.

+plda   PLDA

 pixcir  PIXCIR MICROELECTRONICS Co., Ltd
 pixcir  PIXCIR MICROELECTRONICS Co., Ltd

+pulsedlight    PulsedLight, Inc

 powervr        PowerVR (deprecated, use img)
 qca    Qualcomm Atheros, Inc.
 qcom   Qualcomm Technologies, Inc
 powervr        PowerVR (deprecated, use img)
 qca    Qualcomm Atheros, Inc.
 qcom   Qualcomm Technologies, Inc


@@ -192,7 +197,9 @@ sbs Smart Battery System
 schindler      Schindler
 seagate        Seagate Technology PLC
 semtech        Semtech Corporation
 schindler      Schindler
 seagate        Seagate Technology PLC
 semtech        Semtech Corporation

+sgx    SGX Sensortech

 sharp  Sharp Corporation
 sharp  Sharp Corporation

+sigma  Sigma Designs, Inc.

 sil    Silicon Image
 silabs Silicon Laboratories
 siliconmitus   Silicon Mitus, Inc.
 sil    Silicon Image
 silabs Silicon Laboratories
 siliconmitus   Silicon Mitus, Inc.


@@ -225,6 +232,7 @@ toumaz      Toumaz
 tplink TP-LINK Technologies Co., Ltd.
 tronfy Tronfy
 truly  Truly Semiconductors Limited
 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.
 usi    Universal Scientific Industrial Co., Ltd.
 v3     V3 Semiconductor
 variscite      Variscite Ltd.