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

[linux-2.6-block.git] / Documentation / devicetree / bindings / vendor-prefixes.txt

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 24a9290b8116fe118c1e6a190e1c635eab370d7e..e9034a6c003a6cf43ec4e4b932418eb790ea88fa 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -36,6 +36,7 @@ aptina        Aptina Imaging
 arasan Arasan Chip Systems
 archermind ArcherMind Technology (Nanjing) Co., Ltd.
 arctic Arctic Sand
+arcx   arcx Inc. / Archronix Inc.
 aries  Aries Embedded GmbH
 arm    ARM Ltd.
 armadeus       ARMadeus Systems SARL
@@ -54,6 +55,7 @@ avic  Shanghai AVIC Optoelectronics Co., Ltd.
 avnet  Avnet, Inc.
 axentia        Axentia Technologies AB
 axis   Axis Communications AB
+azoteq Azoteq (Pty) Ltd
 azw     Shenzhen AZW Technology Co., Ltd.
 bananapi BIPAI KEJI LIMITED
 bhf    Beckhoff Automation GmbH & Co. KG
@@ -211,6 +213,7 @@ kiebackpeter    Kieback & Peter GmbH
 kinetic Kinetic Technologies
 kingdisplay    King & Display Technology Co., Ltd.
 kingnovel      Kingnovel Technology Co., Ltd.
+kionix Kionix, Inc.
 kobo   Rakuten Kobo Inc.
 koe    Kaohsiung Opto-Electronics Inc.
 kosagi Sutajio Ko-Usagi PTE Ltd.
@@ -235,6 +238,7 @@ lsi LSI Corp. (LSI Logic)
 lwn    Liebherr-Werk Nenzing GmbH
 macnica        Macnica Americas
 marvell        Marvell Technology Group Ltd.
+maxbotix       MaxBotix Inc.
 maxim  Maxim Integrated Products
 mbvl   Mobiveil Inc.
 mcube  mCube
@@ -306,6 +310,7 @@ oranth      Shenzhen Oranth Technology Co., Ltd.
 ORCL   Oracle Corporation
 orisetech      Orise Technology
 ortustech      Ortus Technology Co., Ltd.
+osddisplays    OSD Displays
 ovti   OmniVision Technologies
 oxsemi Oxford Semiconductor, Ltd.
 panasonic      Panasonic Corporation
@@ -348,7 +353,9 @@ ricoh       Ricoh Co. Ltd.
 rikomagic      Rikomagic Tech Corp. Ltd
 riscv  RISC-V Foundation
 rockchip       Fuzhou Rockchip Electronics Co., Ltd
+rocktech       ROCKTECH DISPLAYS LIMITED
 rohm   ROHM Semiconductor Co., Ltd
+ronbo   Ronbo Electronics
 roofull        Shenzhen Roofull Technology Co, Ltd
 samsung        Samsung Semiconductor
 samtec Samtec/Softing company