Merge tag 'iio-for-3.14a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23...

[~andy/linux] / Documentation / devicetree / bindings / vendor-prefixes.txt

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index b65a44041ec168dc46b9470a9a99bafc7055fe66..8c75d8506c42788514655fb3589e8d6bc367f506 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -13,12 +13,15 @@ amstaos     AMS-Taos Inc.
 apm    Applied Micro Circuits Corporation (APM)
 arm    ARM Ltd.
 atmel  Atmel Corporation
+auo    AU Optronics Corporation
 avago  Avago Technologies
 bosch  Bosch Sensortec GmbH
 brcm   Broadcom Corporation
 capella        Capella Microsystems, Inc
 cavium Cavium, Inc.
+cdns   Cadence Design Systems Inc.
 chrp   Common Hardware Reference Platform
+chunghwa       Chunghwa Picture Tubes Ltd.
 cirrus Cirrus Logic, Inc.
 cortina        Cortina Systems, Inc.
 dallas Maxim Integrated Products (formerly Dallas Semiconductor)
@@ -47,6 +50,8 @@ nintendo      Nintendo
 nvidia NVIDIA
 nxp    NXP Semiconductors
 onnn   ON Semiconductor Corp.
+panasonic      Panasonic Corporation
+phytec PHYTEC Messtechnik GmbH
 picochip       Picochip Ltd
 powervr        PowerVR (deprecated, use img)
 qca    Qualcomm Atheros, Inc.
@@ -66,12 +71,12 @@ snps        Synopsys, Inc.
 st     STMicroelectronics
 ste    ST-Ericsson
 stericsson     ST-Ericsson
-toumaz Toumaz
 ti     Texas Instruments
 toshiba        Toshiba Corporation
+toumaz Toumaz
 v3     V3 Semiconductor
 via    VIA Technologies, Inc.
+winbond Winbond Electronics corp.
 wlf    Wolfson Microelectronics
 wm     Wondermedia Technologies, Inc.
-winbond Winbond Electronics corp.
 xlnx   Xilinx