drm: rcar-du: Convert live DT patches to sugar syntax
diff mbox series

Message ID 20181129105850.10953-1-geert+renesas@glider.be
State New
Headers show
Series
  • drm: rcar-du: Convert live DT patches to sugar syntax
Related show

Commit Message

Geert Uytterhoeven Nov. 29, 2018, 10:58 a.m. UTC
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>
---
The generated dtbs before/after are identical.
---
 .../drm/rcar-du/rcar_du_of_lvds_r8a7790.dts   | 93 +++++++++----------
 .../drm/rcar-du/rcar_du_of_lvds_r8a7791.dts   | 53 +++++------
 .../drm/rcar-du/rcar_du_of_lvds_r8a7793.dts   | 53 +++++------
 .../drm/rcar-du/rcar_du_of_lvds_r8a7795.dts   | 53 +++++------
 .../drm/rcar-du/rcar_du_of_lvds_r8a7796.dts   | 53 +++++------
 5 files changed, 135 insertions(+), 170 deletions(-)

Comments

Kieran Bingham Dec. 14, 2018, 7:39 a.m. UTC | #1
Hi Laurent,

On 29/11/2018 12:43, Laurent Pinchart wrote:
> Hi Geert,
> 
> Thank you for the patch.
> 
> On Thursday, 29 November 2018 12:58:50 EET Geert Uytterhoeven wrote:
>> 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>
>> ---
>> The generated dtbs before/after are identical.
> 
> I was going to ask whether you had tested the patch, but this should be good 
> enough :-)
> 
> The result is nicer to read, thanks.
> 

I agree!

FWIW:

Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>


> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> 
> and taken in my tree.

I was hoping to reference this patch - but I can't see it in a tree
anywhere.

Is there a branch/repo that this is available in now?

--
Regards

Kieran

> 
>> ---
>>  .../drm/rcar-du/rcar_du_of_lvds_r8a7790.dts   | 93 +++++++++----------
>>  .../drm/rcar-du/rcar_du_of_lvds_r8a7791.dts   | 53 +++++------
>>  .../drm/rcar-du/rcar_du_of_lvds_r8a7793.dts   | 53 +++++------
>>  .../drm/rcar-du/rcar_du_of_lvds_r8a7795.dts   | 53 +++++------
>>  .../drm/rcar-du/rcar_du_of_lvds_r8a7796.dts   | 53 +++++------
>>  5 files changed, 135 insertions(+), 170 deletions(-)
>>
>> 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
>> 579753e04f3b3712..8bee4e787a0ab4eb 100644
>> --- 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
>> cb9da1f3942b5b30..92c0509971ec3df5 100644
>> --- 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
>> e7b8804dc3c1a1c5..c8b93f21de0fbb8e 100644
>> --- 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
>> a1327443e6fa4d31..16c2d03cb016c470 100644
>> --- 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
>> b23d6466c4152b6f..680e923ac036c932 100644
>> --- 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>;
>>  		};
>>  	};
>>  };
>
Laurent Pinchart Dec. 14, 2018, 8:06 a.m. UTC | #2
Hi Kieran,

On Friday, 14 December 2018 09:39:55 EET Kieran Bingham wrote:
> On 29/11/2018 12:43, Laurent Pinchart wrote:
> > On Thursday, 29 November 2018 12:58:50 EET Geert Uytterhoeven wrote:
> >> 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>
> >> ---
> >> The generated dtbs before/after are identical.
> > 
> > I was going to ask whether you had tested the patch, but this should be
> > good enough :-)
> > 
> > The result is nicer to read, thanks.
> 
> I agree!
> 
> FWIW:
> 
> Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
> 
> > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > 
> > and taken in my tree.
> 
> I was hoping to reference this patch - but I can't see it in a tree
> anywhere.
> 
> Is there a branch/repo that this is available in now?

I've pushed the pending DRM patches to

	git://linuxtv.org/pinchartl/media.git drm/du/next

Patch
diff mbox series

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 579753e04f3b3712..8bee4e787a0ab4eb 100644
--- 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 cb9da1f3942b5b30..92c0509971ec3df5 100644
--- 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 e7b8804dc3c1a1c5..c8b93f21de0fbb8e 100644
--- 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 a1327443e6fa4d31..16c2d03cb016c470 100644
--- 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 b23d6466c4152b6f..680e923ac036c932 100644
--- 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>;
 		};
 	};
 };