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

   1 From ce9a7a41a9f65cc8cc129cdd27e155b35b26d393 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 ---
  22  arch/arm64/boot/dts/renesas/r8a7795.dtsi | 10 +++++-----
  23  arch/arm64/boot/dts/renesas/r8a7796.dtsi | 10 +++++-----
  24  2 files changed, 10 insertions(+), 10 deletions(-)
  25
  26 diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
  27 index f7f947d27b0d..5bcc2391587d 100644
  28 --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
  29 +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
  30 @@ -3054,11 +3054,6 @@
  31                                 #address-cells = <1>;
  32                                 #size-cells = <0>;
  33
  34 -                               port@0 {
  35 -                                       reg = <0>;
  36 -                                       du_out_rgb: endpoint {
  37 -                                       };
  38 -                               };
  39                                 port@1 {
  40                                         reg = <1>;
  41                                         du_out_hdmi0: endpoint {
  42 @@ -3076,6 +3071,11 @@
  43                                         du_out_lvds0: endpoint {
  44                                         };
  45                                 };
  46 +                               port@0 {
  47 +                                       reg = <0>;
  48 +                                       du_out_rgb: endpoint {
  49 +                                       };
  50 +                               };
  51                         };
  52                 };
  53
  54 diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
  55 index df26656e0f19..154ac1dd91fa 100644
  56 --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
  57 +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
  58 @@ -2846,11 +2846,6 @@
  59                                 #address-cells = <1>;
  60                                 #size-cells = <0>;
  61
  62 -                               port@0 {
  63 -                                       reg = <0>;
  64 -                                       du_out_rgb: endpoint {
  65 -                                       };
  66 -                               };
  67                                 port@1 {
  68                                         reg = <1>;
  69                                         du_out_hdmi0: endpoint {
  70 @@ -2862,6 +2857,11 @@
  71                                         du_out_lvds0: endpoint {
  72                                         };
  73                                 };
  74 +                               port@0 {
  75 +                                       reg = <0>;
  76 +                                       du_out_rgb: endpoint {
  77 +                                       };
  78 +                               };
  79                         };
  80                 };
  81
  82 --
  83 2.11.0
  84