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

[cascardo/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 1457fd4..f0a48ea 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -3,8 +3,8 @@ Device tree binding vendor prefix registry.  Keep list in alphabetical order.
 This isn't an exhaustive list, but you should add new prefixes to it before
 using them to avoid name-space collisions.
 
 This isn't an exhaustive list, but you should add new prefixes to it before
 using them to avoid name-space collisions.
 

-abilis Abilis Systems

 abcn   Abracon Corporation
 abcn   Abracon Corporation

+abilis Abilis Systems

 active-semi    Active-Semi International Inc
 ad     Avionic Design GmbH
 adapteva       Adapteva, Inc.
 active-semi    Active-Semi International Inc
 ad     Avionic Design GmbH
 adapteva       Adapteva, Inc.


@@ -16,22 +16,27 @@ al  Annapurna Labs
 allwinner      Allwinner Technology Co., Ltd.
 alphascale     AlphaScale Integrated Circuits Systems, Inc.
 altr   Altera Corp.
 allwinner      Allwinner Technology Co., Ltd.
 alphascale     AlphaScale Integrated Circuits Systems, Inc.
 altr   Altera Corp.

+amazon Amazon.com, Inc.

 amcc   Applied Micro Circuits Corporation (APM, formally AMCC)
 amd    Advanced Micro Devices (AMD), Inc.
 amlogic        Amlogic, Inc.
 ampire Ampire Co., Ltd.
 ams    AMS AG
 amstaos        AMS-Taos Inc.
 amcc   Applied Micro Circuits Corporation (APM, formally AMCC)
 amd    Advanced Micro Devices (AMD), Inc.
 amlogic        Amlogic, Inc.
 ampire Ampire Co., Ltd.
 ams    AMS AG
 amstaos        AMS-Taos Inc.

+analogix       Analogix Semiconductor, Inc.

 apm    Applied Micro Circuits Corporation (APM)
 aptina Aptina Imaging
 arasan Arasan Chip Systems
 arm    ARM Ltd.
 armadeus       ARMadeus Systems SARL
 apm    Applied Micro Circuits Corporation (APM)
 aptina Aptina Imaging
 arasan Arasan Chip Systems
 arm    ARM Ltd.
 armadeus       ARMadeus Systems SARL

+arrow  Arrow Electronics

 artesyn        Artesyn Embedded Technologies Inc.
 asahi-kasei    Asahi Kasei Corp.
 artesyn        Artesyn Embedded Technologies Inc.
 asahi-kasei    Asahi Kasei Corp.

+aspeed ASPEED Technology Inc.

 atlas  Atlas Scientific LLC
 atmel  Atmel Corporation
 auo    AU Optronics Corporation
 atlas  Atlas Scientific LLC
 atmel  Atmel Corporation
 auo    AU Optronics Corporation

+auvidea Auvidea GmbH

 avago  Avago Technologies
 avic   Shanghai AVIC Optoelectronics Co., Ltd.
 axis   Axis Communications AB
 avago  Avago Technologies
 avic   Shanghai AVIC Optoelectronics Co., Ltd.
 axis   Axis Communications AB


@@ -58,6 +63,7 @@ cnxt  Conexant Systems, Inc.
 compulab       CompuLab Ltd.
 cortina        Cortina Systems, Inc.
 cosmic Cosmic Circuits
 compulab       CompuLab Ltd.
 cortina        Cortina Systems, Inc.
 cosmic Cosmic Circuits

+creative       Creative Technology Ltd

 crystalfontz   Crystalfontz America, Inc.
 cubietech      Cubietech, Ltd.
 cypress        Cypress Semiconductor Corporation
 crystalfontz   Crystalfontz America, Inc.
 cubietech      Cubietech, Ltd.
 cypress        Cypress Semiconductor Corporation


@@ -70,13 +76,18 @@ digilent    Diglent, Inc.
 dlg    Dialog Semiconductor
 dlink  D-Link Corporation
 dmo    Data Modul AG
 dlg    Dialog Semiconductor
 dlink  D-Link Corporation
 dmo    Data Modul AG

+domintech      Domintech Co., Ltd.
+dptechnics     DPTechnics
+dragino        Dragino Technology Co., Limited

 ea     Embedded Artists AB
 ebv    EBV Elektronik
 edt    Emerging Display Technologies
 eeti   eGalax_eMPIA Technology Inc
 elan   Elan Microelectronic Corp.
 ea     Embedded Artists AB
 ebv    EBV Elektronik
 edt    Emerging Display Technologies
 eeti   eGalax_eMPIA Technology Inc
 elan   Elan Microelectronic Corp.

+embest Shenzhen Embest Technology Co., Ltd.

 emmicro        EM Microelectronic
 energymicro    Silicon Laboratories (formerly Energy Micro AS)
 emmicro        EM Microelectronic
 energymicro    Silicon Laboratories (formerly Energy Micro AS)

+engicam        Engicam S.r.l.

 epcos  EPCOS AG
 epfl   Ecole Polytechnique Fédérale de Lausanne
 epson  Seiko Epson Corp.
 epcos  EPCOS AG
 epfl   Ecole Polytechnique Fédérale de Lausanne
 epson  Seiko Epson Corp.


@@ -86,13 +97,16 @@ eukrea  Eukréa Electromatique
 everest        Everest Semiconductor Co. Ltd.
 everspin       Everspin Technologies, Inc.
 excito Excito
 everest        Everest Semiconductor Co. Ltd.
 everspin       Everspin Technologies, Inc.
 excito Excito

+ezchip EZchip Semiconductor

 fcs    Fairchild Semiconductor
 firefly        Firefly
 focaltech      FocalTech Systems Co.,Ltd
 fcs    Fairchild Semiconductor
 firefly        Firefly
 focaltech      FocalTech Systems Co.,Ltd

+friendlyarm    Guangzhou FriendlyARM Computer Tech Co., Ltd

 fsl    Freescale Semiconductor
 ge     General Electric Company
 fsl    Freescale Semiconductor
 ge     General Electric Company

-GEFanuc        GE Fanuc Intelligent Platforms Embedded Systems, Inc.
+geekbuying     GeekBuying

 gef    GE Fanuc Intelligent Platforms Embedded Systems, Inc.
 gef    GE Fanuc Intelligent Platforms Embedded Systems, Inc.

+GEFanuc        GE Fanuc Intelligent Platforms Embedded Systems, Inc.

 geniatech      Geniatech, Inc.
 giantplus      Giantplus Technology Co., Ltd.
 globalscale    Globalscale Technologies, Inc.
 geniatech      Geniatech, Inc.
 giantplus      Giantplus Technology Co., Ltd.
 globalscale    Globalscale Technologies, Inc.


@@ -116,18 +130,23 @@ i2se      I2SE GmbH
 ibm    International Business Machines (IBM)
 idt    Integrated Device Technologies, Inc.
 ifi    Ingenieurburo Fur Ic-Technologie (I/F/I)
 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.
 img    Imagination Technologies Ltd.

+infineon Infineon Technologies
+inforce        Inforce Computing

 ingenic        Ingenic Semiconductor
 innolux        Innolux Corporation
 intel  Intel Corporation
 intercontrol   Inter Control Group
 invensense     InvenSense Inc.
 ingenic        Ingenic Semiconductor
 innolux        Innolux Corporation
 intel  Intel Corporation
 intercontrol   Inter Control Group
 invensense     InvenSense Inc.

+inversepath    Inverse Path
+iom    Iomega Corporation

 isee   ISEE 2007 S.L.
 isil   Intersil
 issi   Integrated Silicon Solutions Inc.
 isee   ISEE 2007 S.L.
 isil   Intersil
 issi   Integrated Silicon Solutions Inc.

+jdi    Japan Display Inc.

 jedec  JEDEC Solid State Technology Association
 karo   Ka-Ro electronics GmbH
 jedec  JEDEC Solid State Technology Association
 karo   Ka-Ro electronics GmbH

+keithkoep      Keith & Koep GmbH

 keymile        Keymile GmbH
 kinetic Kinetic Technologies
 kosagi Sutajio Ko-Usagi PTE Ltd.
 keymile        Keymile GmbH
 kinetic Kinetic Technologies
 kosagi Sutajio Ko-Usagi PTE Ltd.


@@ -137,22 +156,25 @@ lantiq    Lantiq Semiconductor
 lenovo Lenovo Group Ltd.
 lg     LG Corporation
 linux  Linux-specific binding
 lenovo Lenovo Group Ltd.
 lg     LG Corporation
 linux  Linux-specific binding

-lsi    LSI Corp. (LSI Logic)

 lltc   Linear Technology Corporation
 lltc   Linear Technology Corporation

+lsi    LSI Corp. (LSI Logic)

 marvell        Marvell Technology Group Ltd.
 maxim  Maxim Integrated Products
 marvell        Marvell Technology Group Ltd.
 maxim  Maxim Integrated Products

+meas   Measurement Specialties

 mediatek       MediaTek Inc.
 melexis        Melexis N.V.
 melfas MELFAS Inc.
 merrii Merrii Technology Co., Ltd.
 micrel Micrel Inc.
 microchip      Microchip Technology Inc.
 mediatek       MediaTek Inc.
 melexis        Melexis N.V.
 melfas MELFAS Inc.
 merrii Merrii Technology Co., Ltd.
 micrel Micrel Inc.
 microchip      Microchip Technology Inc.

+microcrystal   Micro Crystal AG

 micron Micron Technology Inc.
 minix  MINIX Technology Ltd.
 mitsubishi     Mitsubishi Electric Corporation
 mosaixtech     Mosaix Technologies, Inc.
 moxa   Moxa
 mpl    MPL AG
 micron Micron Technology Inc.
 minix  MINIX Technology Ltd.
 mitsubishi     Mitsubishi Electric Corporation
 mosaixtech     Mosaix Technologies, Inc.
 moxa   Moxa
 mpl    MPL AG

+mqmaker        mqmaker Inc.

 msi    Micro-Star International Co. Ltd.
 mti    Imagination Technologies Ltd. (formerly MIPS Technologies Inc.)
 mundoreader    Mundo Reader S.L.
 msi    Micro-Star International Co. Ltd.
 mti    Imagination Technologies Ltd. (formerly MIPS Technologies Inc.)
 mundoreader    Mundo Reader S.L.


@@ -172,22 +194,25 @@ nvidia    NVIDIA
 nxp    NXP Semiconductors
 okaya  Okaya Electric America, Inc.
 olimex OLIMEX Ltd.
 nxp    NXP Semiconductors
 okaya  Okaya Electric America, Inc.
 olimex OLIMEX Ltd.

+onion  Onion Corporation

 onnn   ON Semiconductor Corp.
 onnn   ON Semiconductor Corp.

+ontat  On Tat Industrial Company

 opencores      OpenCores.org
 option Option NV
 opencores      OpenCores.org
 option Option NV

+ORCL   Oracle Corporation

 ortustech      Ortus Technology Co., Ltd.
 ovti   OmniVision Technologies
 ortustech      Ortus Technology Co., Ltd.
 ovti   OmniVision Technologies

-ORCL   Oracle Corporation
+oxsemi Oxford Semiconductor, Ltd.

 panasonic      Panasonic Corporation
 parade Parade Technologies Inc.
 pericom        Pericom Technology Inc.
 phytec PHYTEC Messtechnik GmbH
 picochip       Picochip Ltd
 panasonic      Panasonic Corporation
 parade Parade Technologies Inc.
 pericom        Pericom Technology Inc.
 phytec PHYTEC Messtechnik GmbH
 picochip       Picochip Ltd

+pixcir  PIXCIR MICROELECTRONICS Co., Ltd

 plathome       Plat'Home Co., Ltd.
 plda   PLDA
 plathome       Plat'Home Co., Ltd.
 plda   PLDA

-pixcir  PIXCIR MICROELECTRONICS Co., Ltd
-pulsedlight    PulsedLight, Inc

 powervr        PowerVR (deprecated, use img)
 powervr        PowerVR (deprecated, use img)

+pulsedlight    PulsedLight, Inc

 qca    Qualcomm Atheros, Inc.
 qcom   Qualcomm Technologies, Inc
 qemu   QEMU, a generic and open source machine emulator and virtualizer
 qca    Qualcomm Atheros, Inc.
 qcom   Qualcomm Technologies, Inc
 qemu   QEMU, a generic and open source machine emulator and virtualizer


@@ -215,12 +240,13 @@ sgx       SGX Sensortech
 sharp  Sharp Corporation
 si-en  Si-En Technology Ltd.
 sigma  Sigma Designs, Inc.
 sharp  Sharp Corporation
 si-en  Si-En Technology Ltd.
 sigma  Sigma Designs, Inc.

+sii    Seiko Instruments, Inc.

 sil    Silicon Image
 silabs Silicon Laboratories
 sil    Silicon Image
 silabs Silicon Laboratories

+silead Silead Inc.
+silergy        Silergy Corp.

 siliconmitus   Silicon Mitus, Inc.
 simtek
 siliconmitus   Silicon Mitus, Inc.
 simtek

-sii    Seiko Instruments, Inc.
-silergy        Silergy Corp.

 sirf   SiRF Technology, Inc.
 sis    Silicon Integrated Systems Corp.
 sitronix       Sitronix Technology Corporation
 sirf   SiRF Technology, Inc.
 sis    Silicon Integrated Systems Corp.
 sitronix       Sitronix Technology Corporation


@@ -234,25 +260,36 @@ sony      Sony Corporation
 spansion       Spansion Inc.
 sprd   Spreadtrum Communications Inc.
 st     STMicroelectronics
 spansion       Spansion Inc.
 sprd   Spreadtrum Communications Inc.
 st     STMicroelectronics

+starry Starry Electronic Technology (ShenZhen) Co., LTD

 startek        Startek
 ste    ST-Ericsson
 stericsson     ST-Ericsson
 startek        Startek
 ste    ST-Ericsson
 stericsson     ST-Ericsson

+summit Summit microelectronics
+sunchip        Shenzhen Sunchip Technology Co., Ltd
+SUNW   Sun Microsystems, Inc
+swir   Sierra Wireless

 syna   Synaptics Inc.
 synology       Synology, Inc.
 syna   Synaptics Inc.
 synology       Synology, Inc.

-SUNW   Sun Microsystems, Inc

 tbs    TBS Technologies
 tbs    TBS Technologies

+tcg    Trusted Computing Group

 tcl    Toby Churchill Ltd.
 tcl    Toby Churchill Ltd.

+technexion     TechNexion

 technologic    Technologic Systems
 thine  THine Electronics, Inc.
 ti     Texas Instruments
 tlm    Trusted Logic Mobility
 technologic    Technologic Systems
 thine  THine Electronics, Inc.
 ti     Texas Instruments
 tlm    Trusted Logic Mobility

+topeet  Topeet

 toradex        Toradex AG
 toshiba        Toshiba Corporation
 toumaz Toumaz
 toradex        Toradex AG
 toshiba        Toshiba Corporation
 toumaz Toumaz

+tpk    TPK U.S.A. LLC

 tplink TP-LINK Technologies Co., Ltd.
 tplink TP-LINK Technologies Co., Ltd.

+tpo    TPO

 tronfy Tronfy
 tronsmart      Tronsmart
 truly  Truly Semiconductors Limited
 tronfy Tronfy
 tronsmart      Tronsmart
 truly  Truly Semiconductors Limited

+tyan   Tyan Computer Corporation
+uniwest        United Western Technologies Corp (UniWest)

 upisemi        uPI Semiconductor Corp.
 urt    United Radiant Technology Corporation
 usi    Universal Scientific Industrial Co., Ltd.
 upisemi        uPI Semiconductor Corp.
 urt    United Radiant Technology Corporation
 usi    Universal Scientific Industrial Co., Ltd.


@@ -262,6 +299,7 @@ via VIA Technologies, Inc.
 virtio Virtual I/O Device Specification, developed by the OASIS consortium
 vivante        Vivante Corporation
 voipac Voipac Technologies s.r.o.
 virtio Virtual I/O Device Specification, developed by the OASIS consortium
 vivante        Vivante Corporation
 voipac Voipac Technologies s.r.o.

+wd     Western Digital Corp.

 wexler Wexler
 winbond Winbond Electronics corp.
 wlf    Wolfson Microelectronics
 wexler Wexler
 winbond Winbond Electronics corp.
 wlf    Wolfson Microelectronics


@@ -270,7 +308,7 @@ x-powers    X-Powers
 xes    Extreme Engineering Solutions (X-ES)
 xillybus       Xillybus Ltd.
 xlnx   Xilinx
 xes    Extreme Engineering Solutions (X-ES)
 xillybus       Xillybus Ltd.
 xlnx   Xilinx

-zyxel  ZyXEL Communications Corp.

 zarlink        Zarlink Semiconductor
 zii    Zodiac Inflight Innovations
 zte    ZTE Corp.
 zarlink        Zarlink Semiconductor
 zii    Zodiac Inflight Innovations
 zte    ZTE Corp.

+zyxel  ZyXEL Communications Corp.