Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux

[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 15321373ec8d4113acfba3f4917aa30fe96bb53b..19e1ef73ab0d9f464d58373d175c38d56fa97aa6 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -14,6 +14,7 @@ bosch Bosch Sensortec GmbH
 brcm   Broadcom Corporation
 cavium Cavium, Inc.
 chrp   Common Hardware Reference Platform
+cirrus Cirrus Logic, Inc.
 cortina        Cortina Systems, Inc.
 dallas Maxim Integrated Products (formerly Dallas Semiconductor)
 denx   Denx Software Engineering
@@ -42,6 +43,7 @@ powervr       PowerVR (deprecated, use img)
 qcom   Qualcomm, Inc.
 ramtron        Ramtron International
 realtek Realtek Semiconductor Corp.
+renesas        Renesas Electronics Corporation
 samsung        Samsung Semiconductor
 sbs    Smart Battery System
 schindler      Schindler
@@ -53,6 +55,7 @@ st    STMicroelectronics
 ste    ST-Ericsson
 stericsson     ST-Ericsson
 ti     Texas Instruments
+toshiba        Toshiba Corporation
 via    VIA Technologies, Inc.
 wlf    Wolfson Microelectronics
 wm     Wondermedia Technologies, Inc.