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

[muen/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 de66b61adcb74d6b17256ee931413ca92339581a..708ff2504260c12b88ac7b749ea0badb3322d8e0 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -5,6 +5,7 @@ using them to avoid name-space collisions.
 
 abcn   Abracon Corporation
 abilis Abilis Systems
 
 abcn   Abracon Corporation
 abilis Abilis Systems

+actions        Actions Semiconductor Co., Ltd.

 active-semi    Active-Semi International Inc
 ad     Avionic Design GmbH
 adapteva       Adapteva, Inc.
 active-semi    Active-Semi International Inc
 ad     Avionic Design GmbH
 adapteva       Adapteva, Inc.


@@ -168,6 +169,7 @@ keithkoep   Keith & Koep GmbH
 keymile        Keymile GmbH
 khadas Khadas
 kinetic Kinetic Technologies
 keymile        Keymile GmbH
 khadas Khadas
 kinetic Kinetic Technologies

+kingnovel      Kingnovel Technology Co., Ltd.

 kosagi Sutajio Ko-Usagi PTE Ltd.
 kyo    Kyocera Corporation
 lacie  LaCie
 kosagi Sutajio Ko-Usagi PTE Ltd.
 kyo    Kyocera Corporation
 lacie  LaCie


@@ -175,6 +177,7 @@ lantiq      Lantiq Semiconductor
 lego   LEGO Systems A/S
 lenovo Lenovo Group Ltd.
 lg     LG Corporation
 lego   LEGO Systems A/S
 lenovo Lenovo Group Ltd.
 lg     LG Corporation

+libretech      Shenzhen Libre Technology Co., Ltd

 licheepi       Lichee Pi
 linaro Linaro Limited
 linksys        Belkin International, Inc. (Linksys)
 licheepi       Lichee Pi
 linaro Linaro Limited
 linksys        Belkin International, Inc. (Linksys)


@@ -337,6 +340,7 @@ tronfy      Tronfy
 tronsmart      Tronsmart
 truly  Truly Semiconductors Limited
 tyan   Tyan Computer Corporation
 tronsmart      Tronsmart
 truly  Truly Semiconductors Limited
 tyan   Tyan Computer Corporation

+ucrobotics     uCRobotics

 udoo   Udoo
 uniwest        United Western Technologies Corp (UniWest)
 upisemi        uPI Semiconductor Corp.
 udoo   Udoo
 uniwest        United Western Technologies Corp (UniWest)
 upisemi        uPI Semiconductor Corp.


@@ -362,6 +366,7 @@ xlnx        Xilinx
 xunlong        Shenzhen Xunlong Software CO.,Limited
 zarlink        Zarlink Semiconductor
 zeitec ZEITEC Semiconductor Co., LTD.
 xunlong        Shenzhen Xunlong Software CO.,Limited
 zarlink        Zarlink Semiconductor
 zeitec ZEITEC Semiconductor Co., LTD.

+zidoo  Shenzhen Zidoo Technology Co., Ltd.

 zii    Zodiac Inflight Innovations
 zte    ZTE Corp.
 zyxel  ZyXEL Communications Corp.
 zii    Zodiac Inflight Innovations
 zte    ZTE Corp.
 zyxel  ZyXEL Communications Corp.