Merge tag 'armsoc-tee' 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 257ec07cbaa063c8c5fc1b3946dd7edc879af681..12e27844bb7b60d33a04673c27e408f09bfa3887 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -80,6 +80,7 @@ denx  Denx Software Engineering
 devantech      Devantech, Ltd.
 digi   Digi International Inc.
 digilent       Diglent, Inc.
+dioo   Dioo Microcircuit Co., Ltd
 dlg    Dialog Semiconductor
 dlink  D-Link Corporation
 dmo    Data Modul AG
@@ -138,6 +139,7 @@ holt        Holt Integrated Circuits, Inc.
 honeywell      Honeywell
 hp     Hewlett Packard
 holtek Holtek Semiconductor, Inc.
+hwacom HwaCom Systems Inc.
 i2se   I2SE GmbH
 ibm    International Business Machines (IBM)
 idt    Integrated Device Technologies, Inc.
@@ -161,6 +163,7 @@ jedec       JEDEC Solid State Technology Association
 karo   Ka-Ro electronics GmbH
 keithkoep      Keith & Koep GmbH
 keymile        Keymile GmbH
+khadas Khadas
 kinetic Kinetic Technologies
 kosagi Sutajio Ko-Usagi PTE Ltd.
 kyo    Kyocera Corporation
@@ -170,6 +173,7 @@ lego        LEGO Systems A/S
 lenovo Lenovo Group Ltd.
 lg     LG Corporation
 licheepi       Lichee Pi
+linaro Linaro Limited
 linux  Linux-specific binding
 lltc   Linear Technology Corporation
 lsi    LSI Corp. (LSI Logic)
@@ -215,6 +219,7 @@ newhaven    Newhaven Display International
 ni     National Instruments
 nintendo       Nintendo
 nokia  Nokia
+nordic Nordic Semiconductor
 nuvoton        Nuvoton Technology Corporation
 nvd    New Vision Display
 nvidia NVIDIA
@@ -261,6 +266,7 @@ richtek     Richtek Technology Corporation
 ricoh  Ricoh Co. Ltd.
 rikomagic      Rikomagic Tech Corp. Ltd
 rockchip       Fuzhou Rockchip Electronics Co., Ltd
+rohm   ROHM Semiconductor Co., Ltd
 samsung        Samsung Semiconductor
 samtec Samtec/Softing company
 sandisk        Sandisk Corporation