Skip to content

Commit a1cc634

Browse files
committed
Merge tag 'at91-soc-6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into soc/dt
Microchip AT91 SoC updates for v6.13 It contains: - DT bindings update for the SAM9X7 TCB block * tag 'at91-soc-6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: dt-bindings: microchip: atmel,at91rm9200-tcb: add sam9x7 compatible Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 2b7fda3 + d1312c5 commit a1cc634

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

Documentation/devicetree/bindings/soc/microchip/atmel,at91rm9200-tcb.yaml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,19 @@ description: |
1515
1616
properties:
1717
compatible:
18-
items:
19-
- enum:
20-
- atmel,at91rm9200-tcb
21-
- atmel,at91sam9x5-tcb
22-
- atmel,sama5d2-tcb
23-
- const: simple-mfd
24-
- const: syscon
18+
oneOf:
19+
- items:
20+
- enum:
21+
- atmel,at91rm9200-tcb
22+
- atmel,at91sam9x5-tcb
23+
- atmel,sama5d2-tcb
24+
- const: simple-mfd
25+
- const: syscon
26+
- items:
27+
- const: microchip,sam9x7-tcb
28+
- const: atmel,sama5d2-tcb
29+
- const: simple-mfd
30+
- const: syscon
2531

2632
reg:
2733
maxItems: 1

0 commit comments

Comments
 (0)