diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-10-20 15:35:34 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-10-20 15:35:35 +0200 |
| commit | 7b27dc2769ba1bbd6fda196e6b426fe00722b0e1 (patch) | |
| tree | 8c7db37edc4d469d8b6e8d312cb5ecdae133922d /Documentation/devicetree/bindings/vendor-prefixes.yaml | |
| parent | 804565cd9994d4be167d0c42062618ef2065caa8 (diff) | |
| parent | 07a6602bdc79fa08df8eb9669ebee66a3d36571c (diff) | |
Merge tag 'gemini-dts-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into arm/dt
Gemini changes for the v5.16 kernel cycle:
- Add device trees for Edimax NS2502 and SSI 1328
- Consolidate PCI interrupts
* tag 'gemini-dts-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
ARM: dts: gemini: Consolidate PCI interrupt-map properties
ARM: gemini: add device tree for ssi1328
ARM: gemini: add device tree for edimax NS2502
dt-bindings: add vendor prefix for ssi
dt-bindings: add vendor prefix for edimax
ARM: dts: gemini: add labels for USB, IDE, flash and ethernet
Link: https://lore.kernel.org/r/CACRpkdac5Sbt42CtuLMgCazfHdhcP98mEKGjeZ-DVcb=_N90Bg@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation/devicetree/bindings/vendor-prefixes.yaml')
| -rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.yaml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml index 18f3f3b286b7..5186c9cbcea7 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml @@ -337,6 +337,8 @@ patternProperties: description: EBV Elektronik "^eckelmann,.*": description: Eckelmann AG + "^edimax,.*": + description: EDIMAX Technology Co., Ltd "^edt,.*": description: Emerging Display Technologies "^eeti,.*": @@ -1108,6 +1110,8 @@ patternProperties: description: SparkFun Electronics "^sprd,.*": description: Spreadtrum Communications Inc. + "^ssi,.*": + description: SSI Computer Corp "^sst,.*": description: Silicon Storage Technology, Inc. "^sstar,.*": |