Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[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 8162b0eb4b5063971f790c52dc8ac7c0857654cd..e0e216002efd47511ecf97c1660a231aafa0f192 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
 bananapi BIPAI KEJI LIMITED
 bhf    Beckhoff Automation GmbH & Co. KG
 bitmain        Bitmain Technologies
@@ -210,6 +212,7 @@ kiebackpeter    Kieback & Peter GmbH
 kinetic Kinetic Technologies
 kingdisplay    King & Display Technology Co., Ltd.
 kingnovel      Kingnovel Technology Co., Ltd.
+kionix Kionix, Inc.
 koe    Kaohsiung Opto-Electronics Inc.
 kosagi Sutajio Ko-Usagi PTE Ltd.
 kyo    Kyocera Corporation
@@ -233,6 +236,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
@@ -302,6 +306,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
@@ -344,7 +349,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