meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0001-arm64-dts-renesas-preserve-drm-HDMI-connector-naming.patch

   1 From a7d41cc40357d10cbb84ac463032f4d28af39162 Mon Sep 17 00:00:00 2001
   2 From: Matt Porter <mporter@konsulko.com>
   3 Date: Wed, 13 Dec 2017 12:49:20 -0500
   4 Subject: [PATCH] arm64: dts: renesas: preserve drm HDMI connector naming
   5  on KF
   6
   7 Kingfisher adds encoders on ports 0 and 2 of the R-Car
   8 display unit. The bare ULCB SK has only an HDMI encoder
   9 in use on port 1. When the system is booted with an SK
  10 dtb, port 1's HDMI encoder is assigned as HDMI-A-1 because
  11 it is the first (and only) encoder present. When booting
  12 a KF dtb, port 0's HDMI encoder preceeds port1 in the dtb due
  13 to incremental ordering of the endpoint port nodes. This causes
  14 the KF HDMI to be assigned HDMI-A-1 and the SK HDMI to be assigned
  15 as HDMI-A-2. In order to preserve the SK's HDMI output naming as
  16 connector HDMI-A-1, reorder the endpoint port nodes so that port1
  17 is first.
  18
  19 Change-Id: Ibbb1975c2383a526a54c257fb7d68d32a042d468
  20 Signed-off-by: Matt Porter <mporter@konsulko.com>
  21 Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
  22 ---
  23  arch/arm64/boot/dts/renesas/r8a77951.dtsi | 10 +++++-----
  24  arch/arm64/boot/dts/renesas/r8a77960.dtsi | 10 +++++-----
  25  arch/arm64/boot/dts/renesas/r8a77961.dtsi | 10 +++++-----
  26  3 files changed, 15 insertions(+), 15 deletions(-)
  27
  28 diff --git a/arch/arm64/boot/dts/renesas/r8a77951.dtsi b/arch/arm64/boot/dts/renesas/r8a77951.dtsi
  29 index 655a71157a5f..c8aa7be0e33e 100644
  30 --- a/arch/arm64/boot/dts/renesas/r8a77951.dtsi
  31 +++ b/arch/arm64/boot/dts/renesas/r8a77951.dtsi
  32 @@ -2373,6 +2373,11 @@ vin7csi41: endpoint@3 {
  33                                                 remote-endpoint = <&csi41vin7>;
  34                                         };
  35                                 };
  36 +                               port@0 {
  37 +                                       reg = <0>;
  38 +                                       du_out_rgb: endpoint {
  39 +                                       };
  40 +                               };
  41                         };
  42                 };
  43
  44 @@ -3955,11 +3960,6 @@ ports {
  45                                 #address-cells = <1>;
  46                                 #size-cells = <0>;
  47
  48 -                               port@0 {
  49 -                                       reg = <0>;
  50 -                                       du_out_rgb: endpoint {
  51 -                                       };
  52 -                               };
  53                                 port@1 {
  54                                         reg = <1>;
  55                                         du_out_hdmi0: endpoint {
  56 diff --git a/arch/arm64/boot/dts/renesas/r8a77960.dtsi b/arch/arm64/boot/dts/renesas/r8a77960.dtsi
  57 index 1b4099f571bd..22ef3d7047fd 100644
  58 --- a/arch/arm64/boot/dts/renesas/r8a77960.dtsi
  59 +++ b/arch/arm64/boot/dts/renesas/r8a77960.dtsi
  60 @@ -2279,6 +2279,11 @@ vin7csi40: endpoint@2 {
  61                                                 remote-endpoint = <&csi40vin7>;
  62                                         };
  63                                 };
  64 +                               port@0 {
  65 +                                       reg = <0>;
  66 +                                       du_out_rgb: endpoint {
  67 +                                       };
  68 +                               };
  69                         };
  70                 };
  71
  72 @@ -3640,11 +3645,6 @@ ports {
  73                                 #address-cells = <1>;
  74                                 #size-cells = <0>;
  75
  76 -                               port@0 {
  77 -                                       reg = <0>;
  78 -                                       du_out_rgb: endpoint {
  79 -                                       };
  80 -                               };
  81                                 port@1 {
  82                                         reg = <1>;
  83                                         du_out_hdmi0: endpoint {
  84 diff --git a/arch/arm64/boot/dts/renesas/r8a77961.dtsi b/arch/arm64/boot/dts/renesas/r8a77961.dtsi
  85 index ef2cb77f3c32..e1555d3673e2 100644
  86 --- a/arch/arm64/boot/dts/renesas/r8a77961.dtsi
  87 +++ b/arch/arm64/boot/dts/renesas/r8a77961.dtsi
  88 @@ -2257,6 +2257,11 @@ vin7csi40: endpoint@2 {
  89                                                 remote-endpoint = <&csi40vin7>;
  90                                         };
  91                                 };
  92 +                               port@0 {
  93 +                                       reg = <0>;
  94 +                                       du_out_rgb: endpoint {
  95 +                                       };
  96 +                               };
  97                         };
  98                 };
  99
 100 @@ -3434,11 +3439,6 @@ ports {
 101                                 #address-cells = <1>;
 102                                 #size-cells = <0>;
 103
 104 -                               port@0 {
 105 -                                       reg = <0>;
 106 -                                       du_out_rgb: endpoint {
 107 -                                       };
 108 -                               };
 109                                 port@1 {
 110                                         reg = <1>;
 111                                         du_out_hdmi0: endpoint {
 112 --
 113 2.31.1
 114