1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
From ce9a7a41a9f65cc8cc129cdd27e155b35b26d393 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
Kingfisher adds encoders on ports 0 and 2 of the R-Car
display unit. The bare ULCB SK has only an HDMI encoder
in use on port 1. When the system is booted with an SK
dtb, port 1's HDMI encoder is assigned as HDMI-A-1 because
it is the first (and only) encoder present. When booting
a KF dtb, port 0's HDMI encoder preceeds port1 in the dtb due
to incremental ordering of the endpoint port nodes. This causes
the KF HDMI to be assigned HDMI-A-1 and the SK HDMI to be assigned
as HDMI-A-2. In order to preserve the SK's HDMI output naming as
connector HDMI-A-1, reorder the endpoint port nodes so that port1
is first.
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(-)
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 @@
#address-cells = <1>;
#size-cells = <0>;
- port@0 {
- reg = <0>;
- du_out_rgb: endpoint {
- };
- };
port@1 {
reg = <1>;
du_out_hdmi0: endpoint {
@@ -3076,6 +3071,11 @@
du_out_lvds0: endpoint {
};
};
+ port@0 {
+ reg = <0>;
+ du_out_rgb: endpoint {
+ };
+ };
};
};
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 @@
#address-cells = <1>;
#size-cells = <0>;
- port@0 {
- reg = <0>;
- du_out_rgb: endpoint {
- };
- };
port@1 {
reg = <1>;
du_out_hdmi0: endpoint {
@@ -2862,6 +2857,11 @@
du_out_lvds0: endpoint {
};
};
+ port@0 {
+ reg = <0>;
+ du_out_rgb: endpoint {
+ };
+ };
};
};
--
2.11.0
|
