diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-09-03 16:12:52 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2019-09-03 16:12:53 +0200 |
| commit | 7eaeb52fd995418fd16388dfb2770092b9a49d0e (patch) | |
| tree | 6b0943e5205ac65c147602e8a013fa5228168b24 /Documentation | |
| parent | Merge tag 'imx-dt64-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sha... (diff) | |
| parent | ARM: dts: at91: at91sam9x5dm.dtsi: Style cleanup (diff) | |
| download | linux-7eaeb52fd995418fd16388dfb2770092b9a49d0e.tar.xz linux-7eaeb52fd995418fd16388dfb2770092b9a49d0e.zip | |
Merge tag 'at91-5.4-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/dt
AT91 DT for 5.4
- style cleanup for at91sam9x5 based boards
- avoid colliding node and property names
* tag 'at91-5.4-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
ARM: dts: at91: at91sam9x5dm.dtsi: Style cleanup
ARM: dts: at91: at91sam9x5_lcd.dtsi: Style cleanup
ARM: dts: at91: at91sam9xx5ek: Style cleanup
ARM: dts: at91: at91sam9g15: Style cleanup
ARM: dts: at91: kizboxmini: Style cleanup
ARM: dts: at91: cosino: Style cleanup
ARM: dts: at91: ariettag25: style cleanup
ARM: dts: at91: ariag25: Style cleanup
ARM: dts: at91: Add label for sam9x5's internal RTC
dt-bindings: add vendor prefix "acme" for "Acme Systems srl"
ARM: dts: at91: Avoid colliding 'display' node and property names
Link: https://lore.kernel.org/r/20190825202642.GA18853@piout.net
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation')
| -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 967fa69d0f76..e60b58d2da87 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml @@ -27,6 +27,8 @@ patternProperties: description: Abilis Systems "^abracon,.*": description: Abracon Corporation + "^acme,.*": + description: Acme Systems srl "^actions,.*": description: Actions Semiconductor Co., Ltd. "^active-semi,.*": |