Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[firefly-linux-kernel-4.4.55.git] / Documentation / devicetree / bindings / vendor-prefixes.txt

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 717ffd5a3563396b341045457d98d5ceac845e8f..a37ad9939a8a72af318670f0833481635c9b39ea 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -54,6 +54,7 @@ cosmic        Cosmic Circuits
 crystalfontz   Crystalfontz America, Inc.
 dallas Maxim Integrated Products (formerly Dallas Semiconductor)
 davicom        DAVICOM Semiconductor, Inc.
+delta  Delta Electronics, Inc.
 denx   Denx Software Engineering
 digi   Digi International Inc.
 digilent       Diglent, Inc.
@@ -161,6 +162,7 @@ ralink      Mediatek/Ralink Technology Corp.
 ramtron        Ramtron International
 realtek Realtek Semiconductor Corp.
 renesas        Renesas Electronics Corporation
+richtek        Richtek Technology Corporation
 ricoh  Ricoh Co. Ltd.
 rockchip       Fuzhou Rockchip Electronics Co., Ltd
 samsung        Samsung Semiconductor
@@ -181,6 +183,7 @@ skyworks    Skyworks Solutions, Inc.
 smsc   Standard Microsystems Corporation
 snps   Synopsys, Inc.
 solidrun       SolidRun
+solomon        Solomon Systech Limited
 sony   Sony Corporation
 spansion       Spansion Inc.
 sprd   Spreadtrum Communications Inc.