Skip to content

Commit 5a5c7b3

Browse files
committed
dt-bindings: display/msm: move common MDSS properties to mdss-common.yaml
Move properties common to all MDSS DT nodes to the mdss-common.yaml. This extends qcom,msm8998-mdss schema to allow interconnect nodes, which will be added later, once msm8998 gains interconnect support. Reviewed-by: Rob Herring <[email protected]> Signed-off-by: Dmitry Baryshkov <[email protected]> Patchwork: https://patchwork.freedesktop.org/patch/508385/ Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Dmitry Baryshkov <[email protected]>
1 parent c3d7f3e commit 5a5c7b3

File tree

6 files changed

+111
-218
lines changed

6 files changed

+111
-218
lines changed

Documentation/devicetree/bindings/display/msm/dpu-msm8998.yaml

Lines changed: 4 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,13 @@ description: |
1414
sub-blocks like DPU display controller, DSI and DP interfaces etc. Device tree
1515
bindings of MDSS and DPU are mentioned for MSM8998 target.
1616
17+
$ref: /schemas/display/msm/mdss-common.yaml#
18+
1719
properties:
1820
compatible:
1921
items:
2022
- const: qcom,msm8998-mdss
2123

22-
reg:
23-
maxItems: 1
24-
25-
reg-names:
26-
const: mdss
27-
28-
power-domains:
29-
maxItems: 1
30-
3124
clocks:
3225
items:
3326
- description: Display AHB clock
@@ -40,23 +33,8 @@ properties:
4033
- const: bus
4134
- const: core
4235

43-
interrupts:
44-
maxItems: 1
45-
46-
interrupt-controller: true
47-
48-
"#address-cells": true
49-
50-
"#size-cells": true
51-
52-
"#interrupt-cells":
53-
const: 1
54-
5536
iommus:
56-
items:
57-
- description: Phandle to apps_smmu node with SID mask for Hard-Fail port0
58-
59-
ranges: true
37+
maxItems: 1
6038

6139
patternProperties:
6240
"^display-controller@[0-9a-f]+$":
@@ -100,18 +78,7 @@ patternProperties:
10078
- const: core
10179
- const: vsync
10280

103-
required:
104-
- compatible
105-
- reg
106-
- reg-names
107-
- power-domains
108-
- clocks
109-
- interrupts
110-
- interrupt-controller
111-
- iommus
112-
- ranges
113-
114-
additionalProperties: false
81+
unevaluatedProperties: false
11582

11683
examples:
11784
- |

Documentation/devicetree/bindings/display/msm/dpu-qcm2290.yaml

Lines changed: 6 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,13 @@ description: |
1414
sub-blocks like DPU display controller and DSI. Device tree bindings of MDSS
1515
and DPU are mentioned for QCM2290 target.
1616
17+
$ref: /schemas/display/msm/mdss-common.yaml#
18+
1719
properties:
1820
compatible:
1921
items:
2022
- const: qcom,qcm2290-mdss
2123

22-
reg:
23-
maxItems: 1
24-
25-
reg-names:
26-
const: mdss
27-
28-
power-domains:
29-
maxItems: 1
30-
3124
clocks:
3225
items:
3326
- description: Display AHB clock from gcc
@@ -40,35 +33,14 @@ properties:
4033
- const: bus
4134
- const: core
4235

43-
interrupts:
44-
maxItems: 1
45-
46-
interrupt-controller: true
47-
48-
"#address-cells": true
49-
50-
"#size-cells": true
51-
52-
"#interrupt-cells":
53-
const: 1
54-
5536
iommus:
56-
items:
57-
- description: Phandle to apps_smmu node with SID mask for Hard-Fail port0
58-
- description: Phandle to apps_smmu node with SID mask for Hard-Fail port1
59-
60-
ranges: true
37+
maxItems: 2
6138

6239
interconnects:
63-
items:
64-
- description: Interconnect path specifying the port ids for data bus
40+
maxItems: 1
6541

6642
interconnect-names:
67-
const: mdp0-mem
68-
69-
resets:
70-
items:
71-
- description: MDSS_CORE reset
43+
maxItems: 1
7244

7345
patternProperties:
7446
"^display-controller@[0-9a-f]+$":
@@ -108,18 +80,7 @@ patternProperties:
10880
- const: lut
10981
- const: vsync
11082

111-
required:
112-
- compatible
113-
- reg
114-
- reg-names
115-
- power-domains
116-
- clocks
117-
- interrupts
118-
- interrupt-controller
119-
- iommus
120-
- ranges
121-
122-
additionalProperties: false
83+
unevaluatedProperties: false
12384

12485
examples:
12586
- |

Documentation/devicetree/bindings/display/msm/dpu-sc7180.yaml

Lines changed: 6 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,13 @@ description: |
1414
sub-blocks like DPU display controller, DSI and DP interfaces etc. Device tree
1515
bindings of MDSS and DPU are mentioned for SC7180 target.
1616
17+
$ref: /schemas/display/msm/mdss-common.yaml#
18+
1719
properties:
1820
compatible:
1921
items:
2022
- const: qcom,sc7180-mdss
2123

22-
reg:
23-
maxItems: 1
24-
25-
reg-names:
26-
const: mdss
27-
28-
power-domains:
29-
maxItems: 1
30-
3124
clocks:
3225
items:
3326
- description: Display AHB clock from gcc
@@ -40,34 +33,14 @@ properties:
4033
- const: ahb
4134
- const: core
4235

43-
interrupts:
44-
maxItems: 1
45-
46-
interrupt-controller: true
47-
48-
"#address-cells": true
49-
50-
"#size-cells": true
51-
52-
"#interrupt-cells":
53-
const: 1
54-
5536
iommus:
56-
items:
57-
- description: Phandle to apps_smmu node with SID mask for Hard-Fail port0
58-
59-
ranges: true
37+
maxItems: 1
6038

6139
interconnects:
62-
items:
63-
- description: Interconnect path specifying the port ids for data bus
40+
maxItems: 1
6441

6542
interconnect-names:
66-
const: mdp0-mem
67-
68-
resets:
69-
items:
70-
- description: MDSS_CORE reset
43+
maxItems: 1
7144

7245
patternProperties:
7346
"^display-controller@[0-9a-f]+$":
@@ -109,18 +82,7 @@ patternProperties:
10982
- const: core
11083
- const: vsync
11184

112-
required:
113-
- compatible
114-
- reg
115-
- reg-names
116-
- power-domains
117-
- clocks
118-
- interrupts
119-
- interrupt-controller
120-
- iommus
121-
- ranges
122-
123-
additionalProperties: false
85+
unevaluatedProperties: false
12486

12587
examples:
12688
- |

Documentation/devicetree/bindings/display/msm/dpu-sc7280.yaml

Lines changed: 6 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,12 @@ description: |
1414
sub-blocks like DPU display controller, DSI and DP interfaces etc. Device tree
1515
bindings of MDSS and DPU are mentioned for SC7280.
1616
17+
$ref: /schemas/display/msm/mdss-common.yaml#
18+
1719
properties:
1820
compatible:
1921
const: qcom,sc7280-mdss
2022

21-
reg:
22-
maxItems: 1
23-
24-
reg-names:
25-
const: mdss
26-
27-
power-domains:
28-
maxItems: 1
29-
3023
clocks:
3124
items:
3225
- description: Display AHB clock from gcc
@@ -39,34 +32,14 @@ properties:
3932
- const: ahb
4033
- const: core
4134

42-
interrupts:
43-
maxItems: 1
44-
45-
interrupt-controller: true
46-
47-
"#address-cells": true
48-
49-
"#size-cells": true
50-
51-
"#interrupt-cells":
52-
const: 1
53-
5435
iommus:
55-
items:
56-
- description: Phandle to apps_smmu node with SID mask for Hard-Fail port0
57-
58-
ranges: true
36+
maxItems: 1
5937

6038
interconnects:
61-
items:
62-
- description: Interconnect path specifying the port ids for data bus
39+
maxItems: 1
6340

6441
interconnect-names:
65-
const: mdp0-mem
66-
67-
resets:
68-
items:
69-
- description: MDSS_CORE reset
42+
maxItems: 1
7043

7144
patternProperties:
7245
"^display-controller@[0-9a-f]+$":
@@ -107,18 +80,7 @@ patternProperties:
10780
- const: core
10881
- const: vsync
10982

110-
required:
111-
- compatible
112-
- reg
113-
- reg-names
114-
- power-domains
115-
- clocks
116-
- interrupts
117-
- interrupt-controller
118-
- iommus
119-
- ranges
120-
121-
additionalProperties: false
83+
unevaluatedProperties: false
12284

12385
examples:
12486
- |

Documentation/devicetree/bindings/display/msm/dpu-sdm845.yaml

Lines changed: 6 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,13 @@ description: |
1414
sub-blocks like DPU display controller, DSI and DP interfaces etc. Device tree
1515
bindings of MDSS and DPU are mentioned for SDM845 target.
1616
17+
$ref: /schemas/display/msm/mdss-common.yaml#
18+
1719
properties:
1820
compatible:
1921
items:
2022
- const: qcom,sdm845-mdss
2123

22-
reg:
23-
maxItems: 1
24-
25-
reg-names:
26-
const: mdss
27-
28-
power-domains:
29-
maxItems: 1
30-
3124
clocks:
3225
items:
3326
- description: Display AHB clock from gcc
@@ -38,38 +31,14 @@ properties:
3831
- const: iface
3932
- const: core
4033

41-
interrupts:
42-
maxItems: 1
43-
44-
interrupt-controller: true
45-
46-
"#address-cells": true
47-
48-
"#size-cells": true
49-
50-
"#interrupt-cells":
51-
const: 1
52-
5334
iommus:
54-
items:
55-
- description: Phandle to apps_smmu node with SID mask for Hard-Fail port0
56-
- description: Phandle to apps_smmu node with SID mask for Hard-Fail port1
57-
58-
ranges: true
35+
maxItems: 2
5936

6037
interconnects:
61-
items:
62-
- description: Interconnect path from mdp0 port to the data bus
63-
- description: Interconnect path from mdp1 port to the data bus
38+
maxItems: 2
6439

6540
interconnect-names:
66-
items:
67-
- const: mdp0-mem
68-
- const: mdp1-mem
69-
70-
resets:
71-
items:
72-
- description: MDSS_CORE reset
41+
maxItems: 2
7342

7443
patternProperties:
7544
"^display-controller@[0-9a-f]+$":
@@ -109,18 +78,7 @@ patternProperties:
10978
- const: core
11079
- const: vsync
11180

112-
required:
113-
- compatible
114-
- reg
115-
- reg-names
116-
- power-domains
117-
- clocks
118-
- interrupts
119-
- interrupt-controller
120-
- iommus
121-
- ranges
122-
123-
additionalProperties: false
81+
unevaluatedProperties: false
12482

12583
examples:
12684
- |

0 commit comments

Comments
 (0)