Merge branch '4.14-features' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[mirror_ubuntu-disco-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 401ed98cab1829f867b9be45af898e0f385308bc..1ea1fd4232ab2ac9c0e736169ef98a02e05ccf8b 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -48,6 +48,7 @@ avic  Shanghai AVIC Optoelectronics Co., Ltd.
 axentia        Axentia Technologies AB
 axis   Axis Communications AB
 bananapi BIPAI KEJI LIMITED
+bhf    Beckhoff Automation GmbH & Co. KG
 boe    BOE Technology Group Co., Ltd.
 bosch  Bosch Sensortec GmbH
 boundary       Boundary Devices Inc.
@@ -292,6 +293,7 @@ schindler   Schindler
 seagate        Seagate Technology PLC
 semtech        Semtech Corporation
 sensirion      Sensirion AG
+sff    Small Form Factor Committee
 sgx    SGX Sensortech
 sharp  Sharp Corporation
 si-en  Si-En Technology Ltd.
@@ -359,6 +361,7 @@ variscite   Variscite Ltd.
 via    VIA Technologies, Inc.
 virtio Virtual I/O Device Specification, developed by the OASIS consortium
 vivante        Vivante Corporation
+vocore VoCore Studio
 voipac Voipac Technologies s.r.o.
 wd     Western Digital Corp.
 wetek  WeTek Electronics, limited.