summaryrefslogtreecommitdiff
path: root/Documentation/devicetree/bindings/vendor-prefixes.yaml
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@gmail.com>2020-08-22 18:40:45 +0300
committerRob Herring <robh@kernel.org>2020-09-09 01:58:21 +0300
commitaf4ed018849be4e17c259103599563b2df2a3484 (patch)
treea989cc4d16fd284a9969476047e4104b15dba16f /Documentation/devicetree/bindings/vendor-prefixes.yaml
parenta85a4aa32ab9568751b7aff8bd33e1b44b1cd3a1 (diff)
downloadlinux-af4ed018849be4e17c259103599563b2df2a3484.tar.xz
dt-bindings: vendor-prefixes: Add Cisco Meraki vendor prefix
Meraki was founded in 2006. The start-up quickly rose to prominence by being based in part on the MIT Roofnet Project. In December 2012, Cisco Systems, Inc. bought Meraki. The "Meraki" branding is still around to this day. Web site of the company: https://meraki.cisco.com/ Signed-off-by: Christian Lamparter <chunkeey@gmail.com> Link: https://lore.kernel.org/r/20200822154045.16036-1-chunkeey@gmail.com Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'Documentation/devicetree/bindings/vendor-prefixes.yaml')
-rw-r--r--Documentation/devicetree/bindings/vendor-prefixes.yaml2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml
index 2baee2c817c1..febe7f00b1f0 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@ -643,6 +643,8 @@ patternProperties:
description: MEMSIC Inc.
"^menlo,.*":
description: Menlo Systems GmbH
+ "^meraki,.*":
+ description: Cisco Meraki, LLC
"^merrii,.*":
description: Merrii Technology Co., Ltd.
"^micrel,.*":