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

[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 e4cd78a4c652fff7e580863eb039af675400018c..72e2c5a2b3278facb20378383cbb63baa6485e0f 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -33,6 +33,7 @@ auo   AU Optronics Corporation
 avago  Avago Technologies
 avic   Shanghai AVIC Optoelectronics Co., Ltd.
 axis   Axis Communications AB
+boe    BOE Technology Group Co., Ltd.
 bosch  Bosch Sensortec GmbH
 boundary       Boundary Devices Inc.
 brcm   Broadcom Corporation
@@ -124,6 +125,7 @@ karo        Ka-Ro electronics GmbH
 keymile        Keymile GmbH
 kinetic Kinetic Technologies
 kosagi Sutajio Ko-Usagi PTE Ltd.
+kyo    Kyocera Corporation
 lacie  LaCie
 lantiq Lantiq Semiconductor
 lenovo Lenovo Group Ltd.
@@ -162,6 +164,7 @@ nuvoton     Nuvoton Technology Corporation
 nvidia NVIDIA
 nxp    NXP Semiconductors
 okaya  Okaya Electric America, Inc.
+olimex OLIMEX Ltd.
 onnn   ON Semiconductor Corp.
 opencores      OpenCores.org
 option Option NV
@@ -181,6 +184,7 @@ qca Qualcomm Atheros, Inc.
 qcom   Qualcomm Technologies, Inc
 qemu   QEMU, a generic and open source machine emulator and virtualizer
 qi     Qi Hardware
+qiaodian       QiaoDian XianShi Corporation
 qnap   QNAP Systems, Inc.
 radxa  Radxa
 raidsonic      RaidSonic Technology GmbH
@@ -241,6 +245,7 @@ v3  V3 Semiconductor
 variscite      Variscite Ltd.
 via    VIA Technologies, Inc.
 virtio Virtual I/O Device Specification, developed by the OASIS consortium
+vivante        Vivante Corporation
 voipac Voipac Technologies s.r.o.
 wexler Wexler
 winbond Winbond Electronics corp.