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>

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7790.dts b/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7790.dts
index 579753e..8bee4e7 100644 (file)
--- a/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7790.dts
+++ b/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7790.dts
@@ -7,70 +7,63 @@
 
 /dts-v1/;
 /plugin/;
-/ {
-       fragment@0 {
-               target-path = "/";
-               __overlay__ {
-                       #address-cells = <2>;
-                       #size-cells = <2>;
 
-                       lvds@feb90000 {
-                               compatible = "renesas,r8a7790-lvds";
-                               reg = <0 0xfeb90000 0 0x1c>;
+&{/} {
+       #address-cells = <2>;
+       #size-cells = <2>;
 
-                               ports {
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
+       lvds@feb90000 {
+               compatible = "renesas,r8a7790-lvds";
+               reg = <0 0xfeb90000 0 0x1c>;
 
-                                       port@0 {
-                                               reg = <0>;
-                                               lvds0_input: endpoint {
-                                               };
-                                       };
-                                       port@1 {
-                                               reg = <1>;
-                                               lvds0_out: endpoint {
-                                               };
-                                       };
+               ports {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       port@0 {
+                               reg = <0>;
+                               lvds0_input: endpoint {
                                };
                        };
-
-                       lvds@feb94000 {
-                               compatible = "renesas,r8a7790-lvds";
-                               reg = <0 0xfeb94000 0 0x1c>;
-
-                               ports {
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-
-                                       port@0 {
-                                               reg = <0>;
-                                               lvds1_input: endpoint {
-                                               };
-                                       };
-                                       port@1 {
-                                               reg = <1>;
-                                               lvds1_out: endpoint {
-                                               };
-                                       };
+                       port@1 {
+                               reg = <1>;
+                               lvds0_out: endpoint {
                                };
                        };
                };
        };
 
-       fragment@1 {
-               target-path = "/display@feb00000/ports";
-               __overlay__ {
-                       port@1 {
-                               endpoint {
-                                       remote-endpoint = <&lvds0_input>;
+       lvds@feb94000 {
+               compatible = "renesas,r8a7790-lvds";
+               reg = <0 0xfeb94000 0 0x1c>;
+
+               ports {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       port@0 {
+                               reg = <0>;
+                               lvds1_input: endpoint {
                                };
                        };
-                       port@2 {
-                               endpoint {
-                                       remote-endpoint = <&lvds1_input>;
+                       port@1 {
+                               reg = <1>;
+                               lvds1_out: endpoint {
                                };
                        };
                };
        };
 };
+
+&{/display@feb00000/ports} {
+       port@1 {
+               endpoint {
+                       remote-endpoint = <&lvds0_input>;
+               };
+       };
+       port@2 {
+               endpoint {
+                       remote-endpoint = <&lvds1_input>;
+               };
+       };
+};

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7791.dts b/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7791.dts
index cb9da1f..92c0509 100644 (file)
--- a/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7791.dts
+++ b/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7791.dts
@@ -7,44 +7,37 @@
 
 /dts-v1/;
 /plugin/;
-/ {
-       fragment@0 {
-               target-path = "/";
-               __overlay__ {
-                       #address-cells = <2>;
-                       #size-cells = <2>;
 
-                       lvds@feb90000 {
-                               compatible = "renesas,r8a7791-lvds";
-                               reg = <0 0xfeb90000 0 0x1c>;
+&{/} {
+       #address-cells = <2>;
+       #size-cells = <2>;
 
-                               ports {
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
+       lvds@feb90000 {
+               compatible = "renesas,r8a7791-lvds";
+               reg = <0 0xfeb90000 0 0x1c>;
 
-                                       port@0 {
-                                               reg = <0>;
-                                               lvds0_input: endpoint {
-                                               };
-                                       };
-                                       port@1 {
-                                               reg = <1>;
-                                               lvds0_out: endpoint {
-                                               };
-                                       };
+               ports {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       port@0 {
+                               reg = <0>;
+                               lvds0_input: endpoint {
                                };
                        };
-               };
-       };
-
-       fragment@1 {
-               target-path = "/display@feb00000/ports";
-               __overlay__ {
                        port@1 {
-                               endpoint {
-                                       remote-endpoint = <&lvds0_input>;
+                               reg = <1>;
+                               lvds0_out: endpoint {
                                };
                        };
                };
        };
 };
+
+&{/display@feb00000/ports} {
+       port@1 {
+               endpoint {
+                       remote-endpoint = <&lvds0_input>;
+               };
+       };
+};

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7793.dts b/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7793.dts
index e7b8804..c8b93f2 100644 (file)
--- a/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7793.dts
+++ b/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7793.dts
@@ -7,44 +7,37 @@
 
 /dts-v1/;
 /plugin/;
-/ {
-       fragment@0 {
-               target-path = "/";
-               __overlay__ {
-                       #address-cells = <2>;
-                       #size-cells = <2>;
 
-                       lvds@feb90000 {
-                               compatible = "renesas,r8a7793-lvds";
-                               reg = <0 0xfeb90000 0 0x1c>;
+&{/} {
+       #address-cells = <2>;
+       #size-cells = <2>;
 
-                               ports {
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
+       lvds@feb90000 {
+               compatible = "renesas,r8a7793-lvds";
+               reg = <0 0xfeb90000 0 0x1c>;
 
-                                       port@0 {
-                                               reg = <0>;
-                                               lvds0_input: endpoint {
-                                               };
-                                       };
-                                       port@1 {
-                                               reg = <1>;
-                                               lvds0_out: endpoint {
-                                               };
-                                       };
+               ports {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       port@0 {
+                               reg = <0>;
+                               lvds0_input: endpoint {
                                };
                        };
-               };
-       };
-
-       fragment@1 {
-               target-path = "/display@feb00000/ports";
-               __overlay__ {
                        port@1 {
-                               endpoint {
-                                       remote-endpoint = <&lvds0_input>;
+                               reg = <1>;
+                               lvds0_out: endpoint {
                                };
                        };
                };
        };
 };
+
+&{/display@feb00000/ports} {
+       port@1 {
+               endpoint {
+                       remote-endpoint = <&lvds0_input>;
+               };
+       };
+};

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7795.dts b/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7795.dts
index a132744..16c2d03 100644 (file)
--- a/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7795.dts
+++ b/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7795.dts
@@ -7,44 +7,37 @@
 
 /dts-v1/;
 /plugin/;
-/ {
-       fragment@0 {
-               target-path = "/soc";
-               __overlay__ {
-                       #address-cells = <2>;
-                       #size-cells = <2>;
 
-                       lvds@feb90000 {
-                               compatible = "renesas,r8a7795-lvds";
-                               reg = <0 0xfeb90000 0 0x14>;
+&{/soc} {
+       #address-cells = <2>;
+       #size-cells = <2>;
 
-                               ports {
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
+       lvds@feb90000 {
+               compatible = "renesas,r8a7795-lvds";
+               reg = <0 0xfeb90000 0 0x14>;
 
-                                       port@0 {
-                                               reg = <0>;
-                                               lvds0_input: endpoint {
-                                               };
-                                       };
-                                       port@1 {
-                                               reg = <1>;
-                                               lvds0_out: endpoint {
-                                               };
-                                       };
+               ports {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       port@0 {
+                               reg = <0>;
+                               lvds0_input: endpoint {
+                               };
+                       };
+                       port@1 {
+                               reg = <1>;
+                               lvds0_out: endpoint {
                                };
                        };
                };
        };
+};
 
-       fragment@1 {
-               target-path = "/soc/display@feb00000/ports";
-               __overlay__ {
-                       port@3 {
-                               endpoint {
-                                       remote-endpoint = <&lvds0_input>;
-                               };
-                       };
+&{/soc/display@feb00000/ports} {
+       port@3 {
+               endpoint {
+                       remote-endpoint = <&lvds0_input>;
                };
        };
 };

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7796.dts b/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7796.dts
index b23d646..680e923 100644 (file)
--- a/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7796.dts
+++ b/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7796.dts
@@ -7,44 +7,37 @@
 
 /dts-v1/;
 /plugin/;
-/ {
-       fragment@0 {
-               target-path = "/soc";
-               __overlay__ {
-                       #address-cells = <2>;
-                       #size-cells = <2>;
 
-                       lvds@feb90000 {
-                               compatible = "renesas,r8a7796-lvds";
-                               reg = <0 0xfeb90000 0 0x14>;
+&{/soc} {
+       #address-cells = <2>;
+       #size-cells = <2>;
 
-                               ports {
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
+       lvds@feb90000 {
+               compatible = "renesas,r8a7796-lvds";
+               reg = <0 0xfeb90000 0 0x14>;
 
-                                       port@0 {
-                                               reg = <0>;
-                                               lvds0_input: endpoint {
-                                               };
-                                       };
-                                       port@1 {
-                                               reg = <1>;
-                                               lvds0_out: endpoint {
-                                               };
-                                       };
+               ports {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       port@0 {
+                               reg = <0>;
+                               lvds0_input: endpoint {
+                               };
+                       };
+                       port@1 {
+                               reg = <1>;
+                               lvds0_out: endpoint {
                                };
                        };
                };
        };
+};
 
-       fragment@1 {
-               target-path = "/soc/display@feb00000/ports";
-               __overlay__ {
-                       port@3 {
-                               endpoint {
-                                       remote-endpoint = <&lvds0_input>;
-                               };
-                       };
+&{/soc/display@feb00000/ports} {
+       port@3 {
+               endpoint {
+                       remote-endpoint = <&lvds0_input>;
                };
        };
 };