Skip to content

Commit 7a3c3a6

Browse files
committed
Merge tag 'samsung-drivers-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/drivers
Samsung SoC drivers changes for v5.19 Make MCT and USI bindings stricter by describing expected interrupts per variant and expected child node. * tag 'samsung-drivers-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: dt-bindings: timer: exynos4210-mct: describe known hardware and its interrupts dt-bindings: soc: samsung: usi: refer to dtschema for SPI Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 728c0d2 + 5fe5801 commit 7a3c3a6

File tree

2 files changed

+65
-4
lines changed

2 files changed

+65
-4
lines changed

Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ patternProperties:
7777
description: Child node describing underlying UART/serial
7878

7979
"^spi@[0-9a-f]+$":
80-
type: object
80+
$ref: /schemas/spi/samsung,spi.yaml
8181
description: Child node describing underlying SPI
8282

8383
required:

Documentation/devicetree/bindings/timer/samsung,exynos4210-mct.yaml

Lines changed: 64 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,20 @@ description: |+
1919
2020
properties:
2121
compatible:
22-
enum:
23-
- samsung,exynos4210-mct
24-
- samsung,exynos4412-mct
22+
oneOf:
23+
- enum:
24+
- samsung,exynos4210-mct
25+
- samsung,exynos4412-mct
26+
- items:
27+
- enum:
28+
- samsung,exynos3250-mct
29+
- samsung,exynos5250-mct
30+
- samsung,exynos5260-mct
31+
- samsung,exynos5420-mct
32+
- samsung,exynos5433-mct
33+
- samsung,exynos850-mct
34+
- tesla,fsd-mct
35+
- const: samsung,exynos4210-mct
2536

2637
clocks:
2738
minItems: 2
@@ -63,6 +74,56 @@ required:
6374
- interrupts
6475
- reg
6576

77+
allOf:
78+
- if:
79+
properties:
80+
compatible:
81+
contains:
82+
const: samsung,exynos3250-mct
83+
then:
84+
properties:
85+
interrupts:
86+
minItems: 8
87+
maxItems: 8
88+
89+
- if:
90+
properties:
91+
compatible:
92+
contains:
93+
const: samsung,exynos5250-mct
94+
then:
95+
properties:
96+
interrupts:
97+
minItems: 6
98+
maxItems: 6
99+
100+
- if:
101+
properties:
102+
compatible:
103+
contains:
104+
enum:
105+
- samsung,exynos5260-mct
106+
- samsung,exynos5420-mct
107+
- samsung,exynos5433-mct
108+
- samsung,exynos850-mct
109+
then:
110+
properties:
111+
interrupts:
112+
minItems: 12
113+
maxItems: 12
114+
115+
- if:
116+
properties:
117+
compatible:
118+
contains:
119+
enum:
120+
- tesla,fsd-mct
121+
then:
122+
properties:
123+
interrupts:
124+
minItems: 16
125+
maxItems: 16
126+
66127
additionalProperties: false
67128

68129
examples:

0 commit comments

Comments
 (0)