diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-03-01 17:56:35 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-03-01 17:56:35 +0300 |
| commit | 7d8e1702b572b677d4c580ff4ca519853a578bf1 (patch) | |
| tree | b15096b0cac566fdb64920ead1930ec338e73a77 /Documentation/devicetree/bindings/vendor-prefixes.yaml | |
| parent | 94b0655636b349120f8cd820a94297fa1ba44726 (diff) | |
| parent | c4deb8344a76831879540f3bd9c0b3cdc1d4b2ef (diff) | |
| download | linux-7d8e1702b572b677d4c580ff4ca519853a578bf1.tar.xz | |
Merge tag 'mvebu-dt-5.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into arm/dt
mvebu dt for 5.18 (part 1)
Add new 2 bays NAS:
- Ctera C200 V1 (kirkwood based)
- Ctera C200 V2 (armada-370 based)
Add support for PCIe legacy INTx interrupts on Armada 385
Add PCIe proprty to limit the power on miniPCIe slots in Turris Omnia
* tag 'mvebu-dt-5.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
ARM: dts: turris-omnia: Set PCIe slot-power-limit-milliwatt properties
ARM: dts: mvebu: Add Ctera C-200 V2 board
ARM: dts: kirkwood: Add Ctera C-200 V1 board
dt-bindings: vendor-prefixes: Add Ctera Networks
ARM: dts: armada-385.dtsi: Add definitions for PCIe legacy INTx interrupts
Link: https://lore.kernel.org/r/87pmn5zrd0.fsf@BL-laptop
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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml index b6addbfea8ff..32c374d44e23 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml @@ -281,6 +281,8 @@ patternProperties: description: Hangzhou C-SKY Microsystems Co., Ltd "^csq,.*": description: Shenzen Chuangsiqi Technology Co.,Ltd. + "^ctera,.*": + description: CTERA Networks Intl. "^cubietech,.*": description: Cubietech, Ltd. "^cui,.*": |