Merge tag 'drm-next-2018-08-15' of git://anongit.freedesktop.org/drm/drm

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

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 41f0b97..f32b798 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -8,6 +8,7 @@ abracon Abracon Corporation
 actions        Actions Semiconductor Co., Ltd.
 active-semi    Active-Semi International Inc
 ad     Avionic Design GmbH
+adafruit       Adafruit Industries, LLC
 adapteva       Adapteva, Inc.
 adaptrum       Adaptrum, Inc.
 adh    AD Holdings Plc.
@@ -87,6 +88,7 @@ cubietech     Cubietech, Ltd.
 cypress        Cypress Semiconductor Corporation
 cznic  CZ.NIC, z.s.p.o.
 dallas Maxim Integrated Products (formerly Dallas Semiconductor)
+dataimage      DataImage, Inc.
 davicom        DAVICOM Semiconductor, Inc.
 delta  Delta Electronics, Inc.
 denx   Denx Software Engineering
@@ -95,6 +97,7 @@ dh    DH electronics GmbH
 digi   Digi International Inc.
 digilent       Diglent, Inc.
 dioo   Dioo Microcircuit Co., Ltd
+dlc    DLC Display Co., Ltd.
 dlg    Dialog Semiconductor
 dlink  D-Link Corporation
 dmo    Data Modul AG
@@ -190,6 +193,7 @@ keymile     Keymile GmbH
 khadas Khadas
 kiebackpeter    Kieback & Peter GmbH
 kinetic Kinetic Technologies
+kingdisplay    King & Display Technology Co., Ltd.
 kingnovel      Kingnovel Technology Co., Ltd.
 koe    Kaohsiung Opto-Electronics Inc.
 kosagi Sutajio Ko-Usagi PTE Ltd.