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

[sfrench/cifs-2.6.git] / Documentation / devicetree / bindings / vendor-prefixes.txt

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 98f83edbfc95b76bd939a7738587c50604ad7eaf..8162b0eb4b5063971f790c52dc8ac7c0857654cd 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -140,11 +140,13 @@ fairphone Fairphone B.V.
 faraday        Faraday Technology Corporation
 fastrax        Fastrax Oy
 fcs    Fairchild Semiconductor
+feiyang        Shenzhen Fly Young Technology Co.,LTD.
 firefly        Firefly
 focaltech      FocalTech Systems Co.,Ltd
 friendlyarm    Guangzhou FriendlyARM Computer Tech Co., Ltd
 fsl    Freescale Semiconductor
 fujitsu        Fujitsu Ltd.
+gateworks      Gateworks Corporation
 gcw Game Consoles Worldwide
 ge     General Electric Company
 geekbuying     GeekBuying
@@ -399,6 +401,7 @@ tcl Toby Churchill Ltd.
 technexion     TechNexion
 technologic    Technologic Systems
 tempo  Tempo Semiconductor
+techstar       Shenzhen Techstar Electronics Co., Ltd.
 terasic        Terasic Inc.
 thine  THine Electronics, Inc.
 ti     Texas Instruments
@@ -439,6 +442,7 @@ vot Vision Optical Technology Co., Ltd.
 wd     Western Digital Corp.
 wetek  WeTek Electronics, limited.
 wexler Wexler
+whwave  Shenzhen whwave Electronics, Inc.
 wi2wi  Wi2Wi, Inc.
 winbond Winbond Electronics corp.
 winstar        Winstar Display Corp.