Merge branch 'for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / rcar-du / rcar_du_of_lvds_r8a7793.dts

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 e7b8804dc3c1a1c5568340162fe2689c8c21a601..c8b93f21de0fbb8ed456e216aec54c463485032c 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>;
+               };
+       };
+};