Merge tag 'devicetree-for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/robh...

[karo-tx-linux.git] / Documentation / devicetree / bindings / vendor-prefixes.txt

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 539471e7c2d261c1fd226743d1407b0a549b4467..787d4225c8ab2cdc1219ac265e1252d8b89f9773 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -28,6 +28,7 @@ arm   ARM Ltd.
 armadeus       ARMadeus Systems SARL
 artesyn        Artesyn Embedded Technologies Inc.
 asahi-kasei    Asahi Kasei Corp.
+atlas  Atlas Scientific LLC
 atmel  Atmel Corporation
 auo    AU Optronics Corporation
 avago  Avago Technologies
@@ -112,6 +113,7 @@ hp  Hewlett Packard
 i2se   I2SE GmbH
 ibm    International Business Machines (IBM)
 idt    Integrated Device Technologies, Inc.
+ifi    Ingenieurburo Fur Ic-Technologie (I/F/I)
 iom    Iomega Corporation
 img    Imagination Technologies Ltd.
 ingenic        Ingenic Semiconductor
@@ -121,6 +123,7 @@ intercontrol        Inter Control Group
 invensense     InvenSense Inc.
 isee   ISEE 2007 S.L.
 isil   Intersil
+issi   Integrated Silicon Solutions Inc.
 jedec  JEDEC Solid State Technology Association
 karo   Ka-Ro electronics GmbH
 keymile        Keymile GmbH
@@ -171,6 +174,7 @@ opencores   OpenCores.org
 option Option NV
 ortustech      Ortus Technology Co., Ltd.
 ovti   OmniVision Technologies
+ORCL   Oracle Corporation
 panasonic      Panasonic Corporation
 parade Parade Technologies Inc.
 pericom        Pericom Technology Inc.
@@ -205,6 +209,7 @@ seagate     Seagate Technology PLC
 semtech        Semtech Corporation
 sgx    SGX Sensortech
 sharp  Sharp Corporation
+si-en  Si-En Technology Ltd.
 sigma  Sigma Designs, Inc.
 sil    Silicon Image
 silabs Silicon Laboratories
@@ -227,7 +232,9 @@ st  STMicroelectronics
 startek        Startek
 ste    ST-Ericsson
 stericsson     ST-Ericsson
+syna   Synaptics Inc.
 synology       Synology, Inc.
+SUNW   Sun Microsystems, Inc
 tbs    TBS Technologies
 tcl    Toby Churchill Ltd.
 technologic    Technologic Systems