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

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

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index b84a705..4b1a2a8 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -84,6 +84,7 @@ cosmic        Cosmic Circuits
 crane  Crane Connectivity Solutions
 creative       Creative Technology Ltd
 crystalfontz   Crystalfontz America, Inc.
+csky   Hangzhou C-SKY Microsystems Co., Ltd
 cubietech      Cubietech, Ltd.
 cypress        Cypress Semiconductor Corporation
 cznic  CZ.NIC, z.s.p.o.
@@ -128,6 +129,7 @@ everspin    Everspin Technologies, Inc.
 exar   Exar Corporation
 excito Excito
 ezchip EZchip Semiconductor
+facebook       Facebook
 fairphone      Fairphone B.V.
 faraday        Faraday Technology Corporation
 fastrax        Fastrax Oy
@@ -236,6 +238,7 @@ micrel      Micrel Inc.
 microchip      Microchip Technology Inc.
 microcrystal   Micro Crystal AG
 micron Micron Technology Inc.
+mikroe         MikroElektronika d.o.o.
 minix  MINIX Technology Ltd.
 miramems       MiraMEMS Sensing Technology Co., Ltd.
 mitsubishi     Mitsubishi Electric Corporation
@@ -275,6 +278,7 @@ nxp NXP Semiconductors
 okaya  Okaya Electric America, Inc.
 oki    Oki Electric Industry Co., Ltd.
 olimex OLIMEX Ltd.
+olpc   One Laptop Per Child
 onion  Onion Corporation
 onnn   ON Semiconductor Corp.
 ontat  On Tat Industrial Company