summaryrefslogtreecommitdiff
path: root/Documentation/devicetree/bindings/vendor-prefixes.yaml
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-12-16 15:08:28 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2020-12-16 15:08:28 -0800
commit62746f92b10a4add6a7db87ff59b901276746b11 (patch)
tree5c0197a06cea6418c49a9a3fbaf349a9d1508f8a /Documentation/devicetree/bindings/vendor-prefixes.yaml
parentf68e4041ef63f03091e44b4eebf1ab5c5d427e6f (diff)
parente33dc2f3636749c2f949a59c2ff8acd4a69c9c78 (diff)
Merge tag 'devicetree-for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree updates from Rob Herring: - Add vendor prefixes for bm, gpio-key, mentor, FII, and Ampere - Add ADP5585/ADP5589 and delta,q54sj108a2 to trivial-devices.yaml - Convert fixed-partitions, i2c-gate and fsl,dpaa2-console bindings to schemas - Drop PicoXcell bindings - Drop unused and undocumented 'pnx,timeout' property from LPC32xx - Add 'dynamic-power-coefficient' to Mali GPU bindings - Make 'make dt_binding_check' not error out on warnings - Various minor binding fixes * tag 'devicetree-for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (22 commits) dt-bindings: mali-bifrost: Add dynamic-power-coefficient dt-bindings: mali-midgard: Add dynamic-power-coefficient dt-bindings: i2c: dw: cancel mandatory requirements for "#address-cells" and "#size-cells" dt-bindings: Remove PicoXcell bindings ARM: dts: lpc32xx: Remove unused and undocumented 'pnx,timeout' dt-bindings: mtd: convert "fixed-partitions" to the json-schema dt-bindings: vendor-prefixes: Add undocumented bm, gpio-key, and mentor prefixes dt-bindings: pci: rcar-pci-ep: Document missing interrupts property dt-bindings: vendor-prefixes: Add an entry for AmpereComputing.com dt-bindings: vendor-prefixes: correct the spelling of TQ-Systems GmbH dt-bindings: mfd: fix stm32 timers example dt-bindings: trivial-devices: Add delta,q54sj108a2 dt-bindings:i2c:i2c-gate: txt to yaml conversion dt-bindings: add ADP5585/ADP5589 entries to trivial-devices dt-bindings: Correct GV11B GPU register sizes dt-bindings: vendor-prefixes: Add FII dt-bindings: Fix typo on the DesignWare IP reset bindings documentation dt-bindings: Fix error in 'make dtbs_check' when using DT_SCHEMA_FILES dt-bindings: arm: vt8500: remove redundant white-spaces dt-bindings: fsl-imx-drm: fix example compatible string ...
Diffstat (limited to 'Documentation/devicetree/bindings/vendor-prefixes.yaml')
-rw-r--r--Documentation/devicetree/bindings/vendor-prefixes.yaml10
1 files changed, 8 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml
index 44f008de77fa..57f5f312e949 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@ -16,7 +16,7 @@ properties: {}
patternProperties:
# Prefixes which are not vendors, but followed the pattern
# DO NOT ADD NEW PROPERTIES TO THIS LIST
- "^(at25|devbus|dmacap|dsa|exynos|fsi[ab]|gpio-fan|gpio|gpmc|hdmi|i2c-gpio),.*": true
+ "^(at25|bm|devbus|dmacap|dsa|exynos|fsi[ab]|gpio-fan|gpio-key|gpio|gpmc|hdmi|i2c-gpio),.*": true
"^(keypad|m25p|max8952|max8997|max8998|mpmc),.*": true
"^(pinctrl-single|#pinctrl-single|PowerPC),.*": true
"^(pl022|pxa-mmc|rcar_sound|rotary-encoder|s5m8767|sdhci),.*": true
@@ -81,6 +81,8 @@ patternProperties:
description: Shenzhen Amediatech Technology Co., Ltd
"^amlogic,.*":
description: Amlogic, Inc.
+ "^ampere,.*":
+ description: Ampere Computing LLC
"^ampire,.*":
description: Ampire Co., Ltd.
"^ams,.*":
@@ -379,6 +381,8 @@ patternProperties:
description: Shenzhen Feixin Photoelectic Co., Ltd
"^feiyang,.*":
description: Shenzhen Fly Young Technology Co.,LTD.
+ "^fii,.*":
+ description: Foxconn Industrial Internet
"^firefly,.*":
description: Firefly
"^focaltech,.*":
@@ -659,6 +663,8 @@ patternProperties:
description: MEMSIC Inc.
"^menlo,.*":
description: Menlo Systems GmbH
+ "^mentor,.*":
+ description: Mentor Graphics
"^meraki,.*":
description: Cisco Meraki, LLC
"^merrii,.*":
@@ -1105,7 +1111,7 @@ patternProperties:
"^tpo,.*":
description: TPO
"^tq,.*":
- description: TQ Systems GmbH
+ description: TQ-Systems GmbH
"^tronfy,.*":
description: Tronfy
"^tronsmart,.*":