Merge remote-tracking branches 'asoc/fix/tlv320aic3x' and 'asoc/fix/wm8962' into...

[linux-drm-fsl-dcu.git] / Documentation / devicetree / bindings / vendor-prefixes.txt

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 66a33ae5f5bcfd01e38c1ce29e0e8694f69ac5ac..82d2ac97af74b2a8e5569576cf92f15f1236c036 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -46,6 +46,7 @@ chipone               ChipOne
 chipspark      ChipSPARK
 chrp   Common Hardware Reference Platform
 chunghwa       Chunghwa Picture Tubes Ltd.
 chipspark      ChipSPARK
 chrp   Common Hardware Reference Platform
 chunghwa       Chunghwa Picture Tubes Ltd.

+ciaa   Computadora Industrial Abierta Argentina

 cirrus Cirrus Logic, Inc.
 cloudengines   Cloud Engines, Inc.
 cnm    Chips&Media, Inc.
 cirrus Cirrus Logic, Inc.
 cloudengines   Cloud Engines, Inc.
 cnm    Chips&Media, Inc.


@@ -54,6 +55,7 @@ cortina       Cortina Systems, Inc.
 cosmic Cosmic Circuits
 crystalfontz   Crystalfontz America, Inc.
 cubietech      Cubietech, Ltd.
 cosmic Cosmic Circuits
 crystalfontz   Crystalfontz America, Inc.
 cubietech      Cubietech, Ltd.

+cypress        Cypress Semiconductor Corporation

 dallas Maxim Integrated Products (formerly Dallas Semiconductor)
 davicom        DAVICOM Semiconductor, Inc.
 delta  Delta Electronics, Inc.
 dallas Maxim Integrated Products (formerly Dallas Semiconductor)
 davicom        DAVICOM Semiconductor, Inc.
 delta  Delta Electronics, Inc.


@@ -113,6 +115,7 @@ intercontrol        Inter Control Group
 invensense     InvenSense Inc.
 isee   ISEE 2007 S.L.
 isil   Intersil
 invensense     InvenSense Inc.
 isee   ISEE 2007 S.L.
 isil   Intersil

+jedec  JEDEC Solid State Technology Association

 karo   Ka-Ro electronics GmbH
 keymile        Keymile GmbH
 kinetic Kinetic Technologies
 karo   Ka-Ro electronics GmbH
 keymile        Keymile GmbH
 kinetic Kinetic Technologies


@@ -136,19 +139,24 @@ mitsubishi        Mitsubishi Electric Corporation
 mosaixtech     Mosaix Technologies, Inc.
 moxa   Moxa
 mpl    MPL AG
 mosaixtech     Mosaix Technologies, Inc.
 moxa   Moxa
 mpl    MPL AG

+msi    Micro-Star International Co. Ltd.

 mti    Imagination Technologies Ltd. (formerly MIPS Technologies Inc.)
 mundoreader    Mundo Reader S.L.
 murata Murata Manufacturing Co., Ltd.
 mxicy  Macronix International Co., Ltd.
 national       National Semiconductor
 mti    Imagination Technologies Ltd. (formerly MIPS Technologies Inc.)
 mundoreader    Mundo Reader S.L.
 murata Murata Manufacturing Co., Ltd.
 mxicy  Macronix International Co., Ltd.
 national       National Semiconductor

+nec    NEC LCD Technologies, Ltd.

 neonode                Neonode Inc.
 netgear        NETGEAR
 netlogic       Broadcom Corporation (formerly NetLogic Microsystems)
 neonode                Neonode Inc.
 netgear        NETGEAR
 netlogic       Broadcom Corporation (formerly NetLogic Microsystems)

+netxeon                Shenzhen Netxeon Technology CO., LTD

 newhaven       Newhaven Display International
 nintendo       Nintendo
 nokia  Nokia
 newhaven       Newhaven Display International
 nintendo       Nintendo
 nokia  Nokia

+nuvoton        Nuvoton Technology Corporation

 nvidia NVIDIA
 nxp    NXP Semiconductors
 nvidia NVIDIA
 nxp    NXP Semiconductors

+okaya  Okaya Electric America, Inc.

 onnn   ON Semiconductor Corp.
 opencores      OpenCores.org
 option Option NV
 onnn   ON Semiconductor Corp.
 opencores      OpenCores.org
 option Option NV


@@ -183,6 +191,7 @@ sbs Smart Battery System
 schindler      Schindler
 seagate        Seagate Technology PLC
 semtech        Semtech Corporation
 schindler      Schindler
 seagate        Seagate Technology PLC
 semtech        Semtech Corporation

+sharp  Sharp Corporation

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


@@ -194,6 +203,7 @@ sitronix    Sitronix Technology Corporation
 skyworks       Skyworks Solutions, Inc.
 smsc   Standard Microsystems Corporation
 snps   Synopsys, Inc.
 skyworks       Skyworks Solutions, Inc.
 smsc   Standard Microsystems Corporation
 snps   Synopsys, Inc.

+socionext      Socionext Inc.

 solidrun       SolidRun
 solomon        Solomon Systech Limited
 sony   Sony Corporation
 solidrun       SolidRun
 solomon        Solomon Systech Limited
 sony   Sony Corporation