diff options
| author | Olof Johansson <olof@lixom.net> | 2019-11-08 10:33:45 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-11-08 10:33:47 -0800 |
| commit | fa9a2f92983b6882686b1ca71cb2ebc69f126d04 (patch) | |
| tree | b5f9b0acee129b3ee70cd0186a25093a4f8cd673 /Documentation | |
| parent | 743f4e5bc01f4f5b1d041c8dac5f471c010d8d8c (diff) | |
| parent | cf79e41074b1759d8d264913b6a15b49c49f9b48 (diff) | |
| download | linux-fa9a2f92983b6882686b1ca71cb2ebc69f126d04.tar.gz linux-fa9a2f92983b6882686b1ca71cb2ebc69f126d04.tar.bz2 linux-fa9a2f92983b6882686b1ca71cb2ebc69f126d04.zip | |
Merge tag 'at91-5.5-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/dt
AT91 DT for 5.5
- New Overkiz Kizbox3 board
- Rework of the other Kizbox device trees
- New filters for i2c on sama5d4 and sama5d2
* tag 'at91-5.5-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
ARM: dts: at91: add a dts and dtsi file for kizbox2 based boards
dt-bindings: arm: at91: Document Kizbox2-2 board binding
ARM: dts: at91: sama5d4_xplained: add digital filter for i2c
ARM: dts: at91: sama5d2_xplained: add analog and digital filter for i2c
ARM: dts: at91: add Overkiz KIZBOX3 board
dt-bindings: arm: at91: Document Kizbox3 HS board binding
dt-bindings: Add vendor prefix for Overkiz SAS
ARM: dts: at91: sama5d2: add an rtc label for derived boards
ARM: dts: at91: sama5d27_som1_ek: add mmc capabilities for SDMMC0
Link: https://lore.kernel.org/r/20191108070938.GA215379@piout.net
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/atmel-at91.yaml | 14 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 |
2 files changed, 16 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/atmel-at91.yaml b/Documentation/devicetree/bindings/arm/atmel-at91.yaml index 6e168abcd4d1..6dd8be401673 100644 --- a/Documentation/devicetree/bindings/arm/atmel-at91.yaml +++ b/Documentation/devicetree/bindings/arm/atmel-at91.yaml @@ -45,6 +45,13 @@ properties: - const: atmel,at91sam9x5 - const: atmel,at91sam9 + - description: Overkiz kizbox3 board + items: + - const: overkiz,kizbox3-hs + - const: atmel,sama5d27 + - const: atmel,sama5d2 + - const: atmel,sama5 + - items: - const: atmel,sama5d27 - const: atmel,sama5d2 @@ -73,6 +80,13 @@ properties: - const: atmel,sama5d3 - const: atmel,sama5 + - description: Overkiz kizbox2 board with two heads + items: + - const: overkiz,kizbox2-2 + - const: atmel,sama5d31 + - const: atmel,sama5d3 + - const: atmel,sama5 + - items: - enum: - atmel,sama5d31 diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml index 967e78c5ec0a..9b1582b3bdc3 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml @@ -705,6 +705,8 @@ patternProperties: description: Ortus Technology Co., Ltd. "^osddisplays,.*": description: OSD Displays + "^overkiz,.*": + description: Overkiz SAS "^ovti,.*": description: OmniVision Technologies "^oxsemi,.*": |