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

[mirror_ubuntu-bionic-kernel.git] / Documentation / devicetree / bindings / vendor-prefixes.txt

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index b2c1b8d80367ec279e41b7ff3f5774703b86535a..0f295a4798ad3de79de775573fb7cd5770de1e2e 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -3,8 +3,8 @@ Device tree binding vendor prefix registry.  Keep list in alphabetical order.
 This isn't an exhaustive list, but you should add new prefixes to it before
 using them to avoid name-space collisions.
 
-abcn   Abracon Corporation
 abilis Abilis Systems
+abracon        Abracon Corporation
 actions        Actions Semiconductor Co., Ltd.
 active-semi    Active-Semi International Inc
 ad     Avionic Design GmbH
@@ -138,6 +138,7 @@ gw  Gateworks Corporation
 hannstar       HannStar Display Corporation
 haoyu  Haoyu Microelectronic Co. Ltd.
 hardkernel     Hardkernel Co., Ltd
+hideep HiDeep Inc.
 himax  Himax Technologies, Inc.
 hisilicon      Hisilicon Limited.
 hit    Hitachi Ltd.
@@ -250,6 +251,7 @@ onnn        ON Semiconductor Corp.
 ontat  On Tat Industrial Company
 opalkelly      Opal Kelly Incorporated
 opencores      OpenCores.org
+openrisc       OpenRISC.io
 option Option NV
 ORCL   Oracle Corporation
 ortustech      Ortus Technology Co., Ltd.