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

   1 From 71c2e7bc6ecf872dd3b45480859dce0f2e941b03 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 on KF
   5
   6 Kingfisher adds encoders on ports 0 and 2 of the R-Car
   7 display unit. The bare ULCB SK has only an HDMI encoder
   8 in use on port 1. When the system is booted with an SK
   9 dtb, port 1's HDMI encoder is assigned as HDMI-A-1 because
  10 it is the first (and only) encoder present. When booting
  11 a KF dtb, port 0's HDMI encoder preceeds port1 in the dtb due
  12 to incremental ordering of the endpoint port nodes. This causes
  13 the KF HDMI to be assigned HDMI-A-1 and the SK HDMI to be assigned
  14 as HDMI-A-2. In order to preserve the SK's HDMI output naming as
  15 connector HDMI-A-1, reorder the endpoint port nodes so that port1
  16 is first.
  17
  18 Change-Id: Ibbb1975c2383a526a54c257fb7d68d32a042d468
  19 Signed-off-by: Matt Porter <mporter@konsulko.com>
  20 Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
  21 Signed-off-by: Harunobu Kurokawa <harunobu.kurokawa.dn@renesas.com>
  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 12e78097533e..9ead58e8a7c2 100644
  30 --- a/arch/arm64/boot/dts/renesas/r8a77951.dtsi
  31 +++ b/arch/arm64/boot/dts/renesas/r8a77951.dtsi
  32 @@ -3943,11 +3943,6 @@ ports {
  33                                 #address-cells = <1>;
  34                                 #size-cells = <0>;
  35
  36 -                               port@0 {
  37 -                                       reg = <0>;
  38 -                                       du_out_rgb: endpoint {
  39 -                                       };
  40 -                               };
  41                                 port@1 {
  42                                         reg = <1>;
  43                                         du_out_hdmi0: endpoint {
  44 @@ -3966,6 +3961,11 @@ du_out_lvds0: endpoint {
  45                                                 remote-endpoint = <&lvds0_in>;
  46                                         };
  47                                 };
  48 +                               port@0 {
  49 +                                       reg = <0>;
  50 +                                       du_out_rgb: endpoint {
  51 +                                       };
  52 +                               };
  53                         };
  54                 };
  55
  56 diff --git a/arch/arm64/boot/dts/renesas/r8a77960.dtsi b/arch/arm64/boot/dts/renesas/r8a77960.dtsi
  57 index 66ab48b3a704..a5481dc4a3f1 100644
  58 --- a/arch/arm64/boot/dts/renesas/r8a77960.dtsi
  59 +++ b/arch/arm64/boot/dts/renesas/r8a77960.dtsi
  60 @@ -3628,11 +3628,6 @@ ports {
  61                                 #address-cells = <1>;
  62                                 #size-cells = <0>;
  63
  64 -                               port@0 {
  65 -                                       reg = <0>;
  66 -                                       du_out_rgb: endpoint {
  67 -                                       };
  68 -                               };
  69                                 port@1 {
  70                                         reg = <1>;
  71                                         du_out_hdmi0: endpoint {
  72 @@ -3645,6 +3640,11 @@ du_out_lvds0: endpoint {
  73                                                 remote-endpoint = <&lvds0_in>;
  74                                         };
  75                                 };
  76 +                               port@0 {
  77 +                                       reg = <0>;
  78 +                                       du_out_rgb: endpoint {
  79 +                                       };
  80 +                               };
  81                         };
  82                 };
  83
  84 diff --git a/arch/arm64/boot/dts/renesas/r8a77961.dtsi b/arch/arm64/boot/dts/renesas/r8a77961.dtsi
  85 index ef2cb77f3c32..032ef1ca0633 100644
  86 --- a/arch/arm64/boot/dts/renesas/r8a77961.dtsi
  87 +++ b/arch/arm64/boot/dts/renesas/r8a77961.dtsi
  88 @@ -3434,11 +3434,6 @@ ports {
  89                                 #address-cells = <1>;
  90                                 #size-cells = <0>;
  91
  92 -                               port@0 {
  93 -                                       reg = <0>;
  94 -                                       du_out_rgb: endpoint {
  95 -                                       };
  96 -                               };
  97                                 port@1 {
  98                                         reg = <1>;
  99                                         du_out_hdmi0: endpoint {
 100 @@ -3451,6 +3446,11 @@ du_out_lvds0: endpoint {
 101                                                 remote-endpoint = <&lvds0_in>;
 102                                         };
 103                                 };
 104 +                               port@0 {
 105 +                                       reg = <0>;
 106 +                                       du_out_rgb: endpoint {
 107 +                                       };
 108 +                               };
 109                         };
 110                 };
 111
 112 --
 113 2.25.1
 114