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

[mirror_ubuntu-bionic-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 6e25c912a5c2611a377d6306e298ca3702aaf84e..b34463b12382a199edd1a65a895c1858ff0c41c9 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -40,6 +40,7 @@ atmel Atmel Corporation
 auo    AU Optronics Corporation
 auvidea Auvidea GmbH
 avago  Avago Technologies
+avia   avia semiconductor
 avic   Shanghai AVIC Optoelectronics Co., Ltd.
 axentia        Axentia Technologies AB
 axis   Axis Communications AB
@@ -70,6 +71,7 @@ creative      Creative Technology Ltd
 crystalfontz   Crystalfontz America, Inc.
 cubietech      Cubietech, Ltd.
 cypress        Cypress Semiconductor Corporation
+cznic  CZ.NIC, z.s.p.o.
 dallas Maxim Integrated Products (formerly Dallas Semiconductor)
 davicom        DAVICOM Semiconductor, Inc.
 delta  Delta Electronics, Inc.
@@ -106,6 +108,7 @@ firefly     Firefly
 focaltech      FocalTech Systems Co.,Ltd
 friendlyarm    Guangzhou FriendlyARM Computer Tech Co., Ltd
 fsl    Freescale Semiconductor
+grmn   Garmin Limited
 ge     General Electric Company
 geekbuying     GeekBuying
 gef    GE Fanuc Intelligent Platforms Embedded Systems, Inc.
@@ -196,6 +199,7 @@ neonode             Neonode Inc.
 netgear        NETGEAR
 netlogic       Broadcom Corporation (formerly NetLogic Microsystems)
 netxeon                Shenzhen Netxeon Technology CO., LTD
+nexbox Nexbox
 newhaven       Newhaven Display International
 ni     National Instruments
 nintendo       Nintendo
@@ -221,6 +225,7 @@ parade      Parade Technologies Inc.
 pericom        Pericom Technology Inc.
 phytec PHYTEC Messtechnik GmbH
 picochip       Picochip Ltd
+pine64 Pine64
 pixcir  PIXCIR MICROELECTRONICS Co., Ltd
 plathome       Plat'Home Co., Ltd.
 plda   PLDA
@@ -242,6 +247,7 @@ realtek Realtek Semiconductor Corp.
 renesas        Renesas Electronics Corporation
 richtek        Richtek Technology Corporation
 ricoh  Ricoh Co. Ltd.
+rikomagic      Rikomagic Tech Corp. Ltd
 rockchip       Fuzhou Rockchip Electronics Co., Ltd
 samsung        Samsung Semiconductor
 samtec Samtec/Softing company