summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2014-02-20 06:02:34 +1000
committerJason Cooper <jason@lakedaemon.net>2014-02-22 01:43:51 +0000
commitf7f2ea9f49b0c97cfb386b14dda4aed2781cb9f1 (patch)
tree558ef35d8095550818532a622ebf63d8af63104c /Documentation
parent7a5b293f2086cfc17519e586bd8f89be72a2fc4e (diff)
downloadlinux-stable-f7f2ea9f49b0c97cfb386b14dda4aed2781cb9f1.tar.gz
linux-stable-f7f2ea9f49b0c97cfb386b14dda4aed2781cb9f1.tar.bz2
linux-stable-f7f2ea9f49b0c97cfb386b14dda4aed2781cb9f1.zip
DT: Vendor prefixes: Add ricoh, qnap, sii and synology
The following patches make use of vendor names: * ricoh (Ricoh Co. Ltd.); * qnap (QNAP Systems, Inc.); * sii (Seiko Instruments, Inc.); and * synology (Synology, Inc.) Add them to the vendor prefix list. Signed-off-by: Ben Peddell <klightspeed@killerwolves.net> Signed-off-by: Andrew Lunn <andrew@lunn.ch> Acked-by: Jason Cooper <jason@lakedaemon.net> Acked-by: Rob Herring <robh@kernel.org> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/vendor-prefixes.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 3f900cd51bf0..c73b435f58f5 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -65,10 +65,12 @@ picochip Picochip Ltd
powervr PowerVR (deprecated, use img)
qca Qualcomm Atheros, Inc.
qcom Qualcomm, Inc.
+qnap QNAP Systems, Inc.
ralink Mediatek/Ralink Technology Corp.
ramtron Ramtron International
realtek Realtek Semiconductor Corp.
renesas Renesas Electronics Corporation
+ricoh Ricoh Co. Ltd.
rockchip Fuzhou Rockchip Electronics Co., Ltd
samsung Samsung Semiconductor
sbs Smart Battery System
@@ -76,11 +78,13 @@ schindler Schindler
sil Silicon Image
silabs Silicon Laboratories
simtek
+sii Seiko Instruments, Inc.
sirf SiRF Technology, Inc.
snps Synopsys, Inc.
st STMicroelectronics
ste ST-Ericsson
stericsson ST-Ericsson
+synology Synology, Inc.
ti Texas Instruments
tlm Trusted Logic Mobility
toshiba Toshiba Corporation