Merge tag 'devicetree-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git...

[platform/kernel/linux-rpi.git] / Documentation / devicetree / bindings / vendor-prefixes.txt

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index ffc8689..6e25c91 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -41,6 +41,7 @@ auo   AU Optronics Corporation
 auvidea Auvidea GmbH
 avago  Avago Technologies
 avic   Shanghai AVIC Optoelectronics Co., Ltd.
+axentia        Axentia Technologies AB
 axis   Axis Communications AB
 boe    BOE Technology Group Co., Ltd.
 bosch  Bosch Sensortec GmbH
@@ -128,6 +129,7 @@ hitex       Hitex Development Tools
 holt   Holt Integrated Circuits, Inc.
 honeywell      Honeywell
 hp     Hewlett Packard
+holtek Holtek Semiconductor, Inc.
 i2se   I2SE GmbH
 ibm    International Business Machines (IBM)
 idt    Integrated Device Technologies, Inc.
@@ -137,6 +139,7 @@ infineon Infineon Technologies
 inforce        Inforce Computing
 ingenic        Ingenic Semiconductor
 innolux        Innolux Corporation
+inside-secure  INSIDE Secure
 intel  Intel Corporation
 intercontrol   Inter Control Group
 invensense     InvenSense Inc.
@@ -163,16 +166,19 @@ lsi       LSI Corp. (LSI Logic)
 macnica        Macnica Americas
 marvell        Marvell Technology Group Ltd.
 maxim  Maxim Integrated Products
+mcube  mCube
 meas   Measurement Specialties
 mediatek       MediaTek Inc.
 melexis        Melexis N.V.
 melfas MELFAS Inc.
+memsic MEMSIC Inc.
 merrii Merrii Technology Co., Ltd.
 micrel Micrel Inc.
 microchip      Microchip Technology Inc.
 microcrystal   Micro Crystal AG
 micron Micron Technology Inc.
 minix  MINIX Technology Ltd.
+miramems       MiraMEMS Sensing Technology Co., Ltd.
 mitsubishi     Mitsubishi Electric Corporation
 mosaixtech     Mosaix Technologies, Inc.
 moxa   Moxa
@@ -195,6 +201,7 @@ ni  National Instruments
 nintendo       Nintendo
 nokia  Nokia
 nuvoton        Nuvoton Technology Corporation
+nvd    New Vision Display
 nvidia NVIDIA
 nxp    NXP Semiconductors
 okaya  Okaya Electric America, Inc.