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

[karo-tx-linux.git] / Documentation / devicetree / bindings / vendor-prefixes.txt

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index cf1c366165079463647298107066e8da2fb65b43..f6824fd8fb65e2fd209fcb5eadc8a44402b91c3a 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -104,11 +104,13 @@ everest   Everest Semiconductor Co. Ltd.
 everspin       Everspin Technologies, Inc.
 excito Excito
 ezchip EZchip Semiconductor
+faraday        Faraday Technology Corporation
 fcs    Fairchild Semiconductor
 firefly        Firefly
 focaltech      FocalTech Systems Co.,Ltd
 friendlyarm    Guangzhou FriendlyARM Computer Tech Co., Ltd
 fsl    Freescale Semiconductor
+fujitsu        Fujitsu Ltd.
 ge     General Electric Company
 geekbuying     GeekBuying
 gef    GE Fanuc Intelligent Platforms Embedded Systems, Inc.
@@ -162,11 +164,14 @@ kosagi    Sutajio Ko-Usagi PTE Ltd.
 kyo    Kyocera Corporation
 lacie  LaCie
 lantiq Lantiq Semiconductor
+lego   LEGO Systems A/S
 lenovo Lenovo Group Ltd.
 lg     LG Corporation
+licheepi       Lichee Pi
 linux  Linux-specific binding
 lltc   Linear Technology Corporation
 lsi    LSI Corp. (LSI Logic)
+lwn    Liebherr-Werk Nenzing GmbH
 macnica        Macnica Americas
 marvell        Marvell Technology Group Ltd.
 maxim  Maxim Integrated Products
@@ -230,6 +235,7 @@ pine64      Pine64
 pixcir  PIXCIR MICROELECTRONICS Co., Ltd
 plathome       Plat'Home Co., Ltd.
 plda   PLDA
+poslab Poslab Technology Co., Ltd.
 powervr        PowerVR (deprecated, use img)
 pulsedlight    PulsedLight, Inc
 qca    Qualcomm Atheros, Inc.
@@ -331,7 +337,9 @@ x-powers    X-Powers
 xes    Extreme Engineering Solutions (X-ES)
 xillybus       Xillybus Ltd.
 xlnx   Xilinx
+xunlong        Shenzhen Xunlong Software CO.,Limited
 zarlink        Zarlink Semiconductor
+zeitec ZEITEC Semiconductor Co., LTD.
 zii    Zodiac Inflight Innovations
 zte    ZTE Corp.
 zyxel  ZyXEL Communications Corp.