X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-bsp%2Fmeta-rcar-gen3-adas%2Frecipes-kernel%2Flinux%2Flinux-renesas%2F0001-arm64-dts-renesas-preserve-drm-HDMI-connector-naming.patch;h=ac5e8996c9531569e3ba922d8ca3f814d106a711;hb=8f9663f069a47337ff957200878242c25d04b25f;hp=64c9542a36a50344a37681a5842241d3baffb463;hpb=6ee7bd778686215048a2df9ea10645d17b232002;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0001-arm64-dts-renesas-preserve-drm-HDMI-connector-naming.patch b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0001-arm64-dts-renesas-preserve-drm-HDMI-connector-naming.patch
index 64c9542a3..ac5e8996c 100644
--- a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0001-arm64-dts-renesas-preserve-drm-HDMI-connector-naming.patch
+++ b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0001-arm64-dts-renesas-preserve-drm-HDMI-connector-naming.patch
@@ -1,7 +1,8 @@
-From ce9a7a41a9f65cc8cc129cdd27e155b35b26d393 Mon Sep 17 00:00:00 2001
+From a7d41cc40357d10cbb84ac463032f4d28af39162 Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@konsulko.com>
 Date: Wed, 13 Dec 2017 12:49:20 -0500
-Subject: [PATCH] arm64: dts: renesas: preserve drm HDMI connector naming on KF
+Subject: [PATCH] arm64: dts: renesas: preserve drm HDMI connector naming
+ on KF
 
 Kingfisher adds encoders on ports 0 and 2 of the R-Car
 display unit. The bare ULCB SK has only an HDMI encoder
@@ -19,15 +20,28 @@ Change-Id: Ibbb1975c2383a526a54c257fb7d68d32a042d468
 Signed-off-by: Matt Porter <mporter@konsulko.com>
 Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
 ---
- arch/arm64/boot/dts/renesas/r8a7795.dtsi | 10 +++++-----
- arch/arm64/boot/dts/renesas/r8a7796.dtsi | 10 +++++-----
- 2 files changed, 10 insertions(+), 10 deletions(-)
+ arch/arm64/boot/dts/renesas/r8a77951.dtsi | 10 +++++-----
+ arch/arm64/boot/dts/renesas/r8a77960.dtsi | 10 +++++-----
+ arch/arm64/boot/dts/renesas/r8a77961.dtsi | 10 +++++-----
+ 3 files changed, 15 insertions(+), 15 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
-index f7f947d27b0d..5bcc2391587d 100644
---- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
-+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
-@@ -3054,11 +3054,6 @@
+diff --git a/arch/arm64/boot/dts/renesas/r8a77951.dtsi b/arch/arm64/boot/dts/renesas/r8a77951.dtsi
+index 655a71157a5f..c8aa7be0e33e 100644
+--- a/arch/arm64/boot/dts/renesas/r8a77951.dtsi
++++ b/arch/arm64/boot/dts/renesas/r8a77951.dtsi
+@@ -2373,6 +2373,11 @@ vin7csi41: endpoint@3 {
+ 						remote-endpoint = <&csi41vin7>;
+ 					};
+ 				};
++				port@0 {
++					reg = <0>;
++					du_out_rgb: endpoint {
++					};
++				};
+ 			};
+ 		};
+ 
+@@ -3955,11 +3960,6 @@ ports {
  				#address-cells = <1>;
  				#size-cells = <0>;
  
@@ -39,8 +53,12 @@ index f7f947d27b0d..5bcc2391587d 100644
  				port@1 {
  					reg = <1>;
  					du_out_hdmi0: endpoint {
-@@ -3076,6 +3071,11 @@
- 					du_out_lvds0: endpoint {
+diff --git a/arch/arm64/boot/dts/renesas/r8a77960.dtsi b/arch/arm64/boot/dts/renesas/r8a77960.dtsi
+index 1b4099f571bd..22ef3d7047fd 100644
+--- a/arch/arm64/boot/dts/renesas/r8a77960.dtsi
++++ b/arch/arm64/boot/dts/renesas/r8a77960.dtsi
+@@ -2279,6 +2279,11 @@ vin7csi40: endpoint@2 {
+ 						remote-endpoint = <&csi40vin7>;
  					};
  				};
 +				port@0 {
@@ -51,11 +69,7 @@ index f7f947d27b0d..5bcc2391587d 100644
  			};
  		};
  
-diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
-index df26656e0f19..154ac1dd91fa 100644
---- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
-+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
-@@ -2846,11 +2846,6 @@
+@@ -3640,11 +3645,6 @@ ports {
  				#address-cells = <1>;
  				#size-cells = <0>;
  
@@ -67,8 +81,12 @@ index df26656e0f19..154ac1dd91fa 100644
  				port@1 {
  					reg = <1>;
  					du_out_hdmi0: endpoint {
-@@ -2862,6 +2857,11 @@
- 					du_out_lvds0: endpoint {
+diff --git a/arch/arm64/boot/dts/renesas/r8a77961.dtsi b/arch/arm64/boot/dts/renesas/r8a77961.dtsi
+index ef2cb77f3c32..e1555d3673e2 100644
+--- a/arch/arm64/boot/dts/renesas/r8a77961.dtsi
++++ b/arch/arm64/boot/dts/renesas/r8a77961.dtsi
+@@ -2257,6 +2257,11 @@ vin7csi40: endpoint@2 {
+ 						remote-endpoint = <&csi40vin7>;
  					};
  				};
 +				port@0 {
@@ -79,6 +97,18 @@ index df26656e0f19..154ac1dd91fa 100644
  			};
  		};
  
+@@ -3434,11 +3439,6 @@ ports {
+ 				#address-cells = <1>;
+ 				#size-cells = <0>;
+ 
+-				port@0 {
+-					reg = <0>;
+-					du_out_rgb: endpoint {
+-					};
+-				};
+ 				port@1 {
+ 					reg = <1>;
+ 					du_out_hdmi0: endpoint {
 -- 
-2.11.0
+2.31.1