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 686771d056c7e5969683813b22335b704b19be06..e0e216002efd47511ecf97c1660a231aafa0f192 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -55,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
@@ -305,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
@@ -347,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