tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm: rcar-du: Convert live DT patches to sugar syntax
Using overlay sugar syntax makes the DTS files easier to read (and
write).
Overlay syntactic sugar for generating target-path fragments is
supported by the version of dtc supplied with the kernel since commit
50aafd60898a8b3e ("scripts/dtc: Update to upstream version
v1.4.6-21-g84e414b0b5bc").
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
authored by
Geert Uytterhoeven
and committed by
Laurent Pinchart
f325529b
06c3bbd3
+136
-171
+44
-51
drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7790.dts
+44
-51
drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7790.dts
···
7
7
8
8
/dts-v1/;
9
9
/plugin/;
10
-
/ {
11
-
fragment@0 {
12
-
target-path = "/";
13
-
__overlay__ {
14
-
#address-cells = <2>;
15
-
#size-cells = <2>;
16
10
17
-
lvds@feb90000 {
18
-
compatible = "renesas,r8a7790-lvds";
19
-
reg = <0 0xfeb90000 0 0x1c>;
11
+
&{/} {
12
+
#address-cells = <2>;
13
+
#size-cells = <2>;
20
14
21
-
ports {
22
-
#address-cells = <1>;
23
-
#size-cells = <0>;
15
+
lvds@feb90000 {
16
+
compatible = "renesas,r8a7790-lvds";
17
+
reg = <0 0xfeb90000 0 0x1c>;
24
18
25
-
port@0 {
26
-
reg = <0>;
27
-
lvds0_input: endpoint {
28
-
};
29
-
};
30
-
port@1 {
31
-
reg = <1>;
32
-
lvds0_out: endpoint {
33
-
};
34
-
};
19
+
ports {
20
+
#address-cells = <1>;
21
+
#size-cells = <0>;
22
+
23
+
port@0 {
24
+
reg = <0>;
25
+
lvds0_input: endpoint {
35
26
};
36
27
};
37
-
38
-
lvds@feb94000 {
39
-
compatible = "renesas,r8a7790-lvds";
40
-
reg = <0 0xfeb94000 0 0x1c>;
41
-
42
-
ports {
43
-
#address-cells = <1>;
44
-
#size-cells = <0>;
45
-
46
-
port@0 {
47
-
reg = <0>;
48
-
lvds1_input: endpoint {
49
-
};
50
-
};
51
-
port@1 {
52
-
reg = <1>;
53
-
lvds1_out: endpoint {
54
-
};
55
-
};
28
+
port@1 {
29
+
reg = <1>;
30
+
lvds0_out: endpoint {
56
31
};
57
32
};
58
33
};
59
34
};
60
35
61
-
fragment@1 {
62
-
target-path = "/display@feb00000/ports";
63
-
__overlay__ {
36
+
lvds@feb94000 {
37
+
compatible = "renesas,r8a7790-lvds";
38
+
reg = <0 0xfeb94000 0 0x1c>;
39
+
40
+
ports {
41
+
#address-cells = <1>;
42
+
#size-cells = <0>;
43
+
44
+
port@0 {
45
+
reg = <0>;
46
+
lvds1_input: endpoint {
47
+
};
48
+
};
64
49
port@1 {
65
-
endpoint {
66
-
remote-endpoint = <&lvds0_input>;
50
+
reg = <1>;
51
+
lvds1_out: endpoint {
67
52
};
68
53
};
69
-
port@2 {
70
-
endpoint {
71
-
remote-endpoint = <&lvds1_input>;
72
-
};
73
-
};
54
+
};
55
+
};
56
+
};
57
+
58
+
&{/display@feb00000/ports} {
59
+
port@1 {
60
+
endpoint {
61
+
remote-endpoint = <&lvds0_input>;
62
+
};
63
+
};
64
+
port@2 {
65
+
endpoint {
66
+
remote-endpoint = <&lvds1_input>;
74
67
};
75
68
};
76
69
};
+23
-30
drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7791.dts
+23
-30
drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7791.dts
···
7
7
8
8
/dts-v1/;
9
9
/plugin/;
10
-
/ {
11
-
fragment@0 {
12
-
target-path = "/";
13
-
__overlay__ {
14
-
#address-cells = <2>;
15
-
#size-cells = <2>;
16
10
17
-
lvds@feb90000 {
18
-
compatible = "renesas,r8a7791-lvds";
19
-
reg = <0 0xfeb90000 0 0x1c>;
11
+
&{/} {
12
+
#address-cells = <2>;
13
+
#size-cells = <2>;
20
14
21
-
ports {
22
-
#address-cells = <1>;
23
-
#size-cells = <0>;
15
+
lvds@feb90000 {
16
+
compatible = "renesas,r8a7791-lvds";
17
+
reg = <0 0xfeb90000 0 0x1c>;
24
18
25
-
port@0 {
26
-
reg = <0>;
27
-
lvds0_input: endpoint {
28
-
};
29
-
};
30
-
port@1 {
31
-
reg = <1>;
32
-
lvds0_out: endpoint {
33
-
};
34
-
};
19
+
ports {
20
+
#address-cells = <1>;
21
+
#size-cells = <0>;
22
+
23
+
port@0 {
24
+
reg = <0>;
25
+
lvds0_input: endpoint {
26
+
};
27
+
};
28
+
port@1 {
29
+
reg = <1>;
30
+
lvds0_out: endpoint {
35
31
};
36
32
};
37
33
};
38
34
};
35
+
};
39
36
40
-
fragment@1 {
41
-
target-path = "/display@feb00000/ports";
42
-
__overlay__ {
43
-
port@1 {
44
-
endpoint {
45
-
remote-endpoint = <&lvds0_input>;
46
-
};
47
-
};
37
+
&{/display@feb00000/ports} {
38
+
port@1 {
39
+
endpoint {
40
+
remote-endpoint = <&lvds0_input>;
48
41
};
49
42
};
50
43
};
+23
-30
drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7793.dts
+23
-30
drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7793.dts
···
7
7
8
8
/dts-v1/;
9
9
/plugin/;
10
-
/ {
11
-
fragment@0 {
12
-
target-path = "/";
13
-
__overlay__ {
14
-
#address-cells = <2>;
15
-
#size-cells = <2>;
16
10
17
-
lvds@feb90000 {
18
-
compatible = "renesas,r8a7793-lvds";
19
-
reg = <0 0xfeb90000 0 0x1c>;
11
+
&{/} {
12
+
#address-cells = <2>;
13
+
#size-cells = <2>;
20
14
21
-
ports {
22
-
#address-cells = <1>;
23
-
#size-cells = <0>;
15
+
lvds@feb90000 {
16
+
compatible = "renesas,r8a7793-lvds";
17
+
reg = <0 0xfeb90000 0 0x1c>;
24
18
25
-
port@0 {
26
-
reg = <0>;
27
-
lvds0_input: endpoint {
28
-
};
29
-
};
30
-
port@1 {
31
-
reg = <1>;
32
-
lvds0_out: endpoint {
33
-
};
34
-
};
19
+
ports {
20
+
#address-cells = <1>;
21
+
#size-cells = <0>;
22
+
23
+
port@0 {
24
+
reg = <0>;
25
+
lvds0_input: endpoint {
26
+
};
27
+
};
28
+
port@1 {
29
+
reg = <1>;
30
+
lvds0_out: endpoint {
35
31
};
36
32
};
37
33
};
38
34
};
35
+
};
39
36
40
-
fragment@1 {
41
-
target-path = "/display@feb00000/ports";
42
-
__overlay__ {
43
-
port@1 {
44
-
endpoint {
45
-
remote-endpoint = <&lvds0_input>;
46
-
};
47
-
};
37
+
&{/display@feb00000/ports} {
38
+
port@1 {
39
+
endpoint {
40
+
remote-endpoint = <&lvds0_input>;
48
41
};
49
42
};
50
43
};
+23
-30
drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7795.dts
+23
-30
drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7795.dts
···
7
7
8
8
/dts-v1/;
9
9
/plugin/;
10
-
/ {
11
-
fragment@0 {
12
-
target-path = "/soc";
13
-
__overlay__ {
14
-
#address-cells = <2>;
15
-
#size-cells = <2>;
16
10
17
-
lvds@feb90000 {
18
-
compatible = "renesas,r8a7795-lvds";
19
-
reg = <0 0xfeb90000 0 0x14>;
11
+
&{/soc} {
12
+
#address-cells = <2>;
13
+
#size-cells = <2>;
20
14
21
-
ports {
22
-
#address-cells = <1>;
23
-
#size-cells = <0>;
15
+
lvds@feb90000 {
16
+
compatible = "renesas,r8a7795-lvds";
17
+
reg = <0 0xfeb90000 0 0x14>;
24
18
25
-
port@0 {
26
-
reg = <0>;
27
-
lvds0_input: endpoint {
28
-
};
29
-
};
30
-
port@1 {
31
-
reg = <1>;
32
-
lvds0_out: endpoint {
33
-
};
34
-
};
19
+
ports {
20
+
#address-cells = <1>;
21
+
#size-cells = <0>;
22
+
23
+
port@0 {
24
+
reg = <0>;
25
+
lvds0_input: endpoint {
26
+
};
27
+
};
28
+
port@1 {
29
+
reg = <1>;
30
+
lvds0_out: endpoint {
35
31
};
36
32
};
37
33
};
38
34
};
35
+
};
39
36
40
-
fragment@1 {
41
-
target-path = "/soc/display@feb00000/ports";
42
-
__overlay__ {
43
-
port@3 {
44
-
endpoint {
45
-
remote-endpoint = <&lvds0_input>;
46
-
};
47
-
};
37
+
&{/soc/display@feb00000/ports} {
38
+
port@3 {
39
+
endpoint {
40
+
remote-endpoint = <&lvds0_input>;
48
41
};
49
42
};
50
43
};
+23
-30
drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7796.dts
+23
-30
drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7796.dts
···
7
7
8
8
/dts-v1/;
9
9
/plugin/;
10
-
/ {
11
-
fragment@0 {
12
-
target-path = "/soc";
13
-
__overlay__ {
14
-
#address-cells = <2>;
15
-
#size-cells = <2>;
16
10
17
-
lvds@feb90000 {
18
-
compatible = "renesas,r8a7796-lvds";
19
-
reg = <0 0xfeb90000 0 0x14>;
11
+
&{/soc} {
12
+
#address-cells = <2>;
13
+
#size-cells = <2>;
20
14
21
-
ports {
22
-
#address-cells = <1>;
23
-
#size-cells = <0>;
15
+
lvds@feb90000 {
16
+
compatible = "renesas,r8a7796-lvds";
17
+
reg = <0 0xfeb90000 0 0x14>;
24
18
25
-
port@0 {
26
-
reg = <0>;
27
-
lvds0_input: endpoint {
28
-
};
29
-
};
30
-
port@1 {
31
-
reg = <1>;
32
-
lvds0_out: endpoint {
33
-
};
34
-
};
19
+
ports {
20
+
#address-cells = <1>;
21
+
#size-cells = <0>;
22
+
23
+
port@0 {
24
+
reg = <0>;
25
+
lvds0_input: endpoint {
26
+
};
27
+
};
28
+
port@1 {
29
+
reg = <1>;
30
+
lvds0_out: endpoint {
35
31
};
36
32
};
37
33
};
38
34
};
35
+
};
39
36
40
-
fragment@1 {
41
-
target-path = "/soc/display@feb00000/ports";
42
-
__overlay__ {
43
-
port@3 {
44
-
endpoint {
45
-
remote-endpoint = <&lvds0_input>;
46
-
};
47
-
};
37
+
&{/soc/display@feb00000/ports} {
38
+
port@3 {
39
+
endpoint {
40
+
remote-endpoint = <&lvds0_input>;
48
41
};
49
42
};
50
43
};