Skip to content

Commit 5408d51

Browse files
Marek VasutAlexandre Torgue
authored andcommitted
ARM: dts: stm32: Deduplicate DSI node on stm32mp15
All boards using the DSI node duplicate the same pattern common pattern in board DTs, that pattern is ports with endpoint labels and the same in-SoC regulator connection. Move that common pattern into stm32mp157.dtsi instead. The two boards which do define panel@0 directly in the DSI bridge node now have #address-cells/#size-cells in their board DT instead of it being in stm32mp157.dtsi and activated incorrectly for all boards, even the ones which use e.g. another DSI-to-something bridge. Signed-off-by: Marek Vasut <marex@denx.de> Acked-by: Raphaël Gallais-Pou <raphael.gallais-pou@foss.st.com> Signed-off-by: Alexandre Torgue <alexandre.torgue@foss.st.com>
1 parent 5060e27 commit 5408d51

5 files changed

Lines changed: 48 additions & 78 deletions

File tree

arch/arm/boot/dts/st/stm32mp157.dtsi

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,27 @@
2222
reg = <0x5a000000 0x800>;
2323
clocks = <&rcc DSI_K>, <&clk_hse>, <&rcc DSI_PX>;
2424
clock-names = "pclk", "ref", "px_clk";
25+
phy-dsi-supply = <&reg18>;
2526
resets = <&rcc DSI_R>;
2627
reset-names = "apb";
2728
status = "disabled";
29+
30+
ports {
31+
#address-cells = <1>;
32+
#size-cells = <0>;
33+
34+
port@0 {
35+
reg = <0>;
36+
dsi_in: endpoint {
37+
};
38+
};
39+
40+
port@1 {
41+
reg = <1>;
42+
dsi_out: endpoint {
43+
};
44+
};
45+
};
2846
};
2947
};
3048
};

arch/arm/boot/dts/st/stm32mp157a-icore-stm32mp1-ctouch2-of10.dts

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -46,26 +46,14 @@
4646

4747
&dsi {
4848
status = "okay";
49-
phy-dsi-supply = <&reg18>;
50-
51-
ports {
52-
#address-cells = <1>;
53-
#size-cells = <0>;
49+
};
5450

55-
port@0 {
56-
reg = <0>;
57-
dsi_in: endpoint {
58-
remote-endpoint = <&ltdc_ep0_out>;
59-
};
60-
};
51+
&dsi_in {
52+
remote-endpoint = <&ltdc_ep0_out>;
53+
};
6154

62-
port@1 {
63-
reg = <1>;
64-
dsi_out: endpoint {
65-
remote-endpoint = <&bridge_in>;
66-
};
67-
};
68-
};
55+
&dsi_out {
56+
remote-endpoint = <&bridge_in>;
6957
};
7058

7159
&i2c6 {

arch/arm/boot/dts/st/stm32mp157a-icore-stm32mp1-edimm2.2.dts

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -46,26 +46,14 @@
4646

4747
&dsi {
4848
status = "okay";
49-
phy-dsi-supply = <&reg18>;
50-
51-
ports {
52-
#address-cells = <1>;
53-
#size-cells = <0>;
49+
};
5450

55-
port@0 {
56-
reg = <0>;
57-
dsi_in_ltdc: endpoint {
58-
remote-endpoint = <&ltdc_out_dsi>;
59-
};
60-
};
51+
&dsi_in {
52+
remote-endpoint = <&ltdc_out_dsi>;
53+
};
6154

62-
port@1 {
63-
reg = <1>;
64-
dsi_out_bridge: endpoint {
65-
remote-endpoint = <&bridge_in_dsi>;
66-
};
67-
};
68-
};
55+
&dsi_out {
56+
remote-endpoint = <&bridge_in_dsi>;
6957
};
7058

7159
&i2c6 {
@@ -88,7 +76,7 @@
8876
port@0 {
8977
reg = <0>;
9078
bridge_in_dsi: endpoint {
91-
remote-endpoint = <&dsi_out_bridge>;
79+
remote-endpoint = <&dsi_out>;
9280
data-lanes = <1 2>;
9381
};
9482
};
@@ -108,7 +96,7 @@
10896

10997
port {
11098
ltdc_out_dsi: endpoint {
111-
remote-endpoint = <&dsi_in_ltdc>;
99+
remote-endpoint = <&dsi_in>;
112100
};
113101
};
114102
};

arch/arm/boot/dts/st/stm32mp157c-dk2.dts

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -34,26 +34,6 @@
3434
#address-cells = <1>;
3535
#size-cells = <0>;
3636
status = "okay";
37-
phy-dsi-supply = <&reg18>;
38-
39-
ports {
40-
#address-cells = <1>;
41-
#size-cells = <0>;
42-
43-
port@0 {
44-
reg = <0>;
45-
dsi_in: endpoint {
46-
remote-endpoint = <&ltdc_ep1_out>;
47-
};
48-
};
49-
50-
port@1 {
51-
reg = <1>;
52-
dsi_out: endpoint {
53-
remote-endpoint = <&panel_in>;
54-
};
55-
};
56-
};
5737

5838
panel@0 {
5939
compatible = "orisetech,otm8009a";
@@ -70,6 +50,14 @@
7050
};
7151
};
7252

53+
&dsi_in {
54+
remote-endpoint = <&ltdc_ep1_out>;
55+
};
56+
57+
&dsi_out {
58+
remote-endpoint = <&panel_in>;
59+
};
60+
7361
&i2c1 {
7462
touchscreen@38 {
7563
compatible = "focaltech,ft6236";

arch/arm/boot/dts/st/stm32mp157c-ev1.dts

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -100,30 +100,10 @@
100100
};
101101

102102
&dsi {
103-
phy-dsi-supply = <&reg18>;
104103
#address-cells = <1>;
105104
#size-cells = <0>;
106105
status = "okay";
107106

108-
ports {
109-
#address-cells = <1>;
110-
#size-cells = <0>;
111-
112-
port@0 {
113-
reg = <0>;
114-
dsi_in: endpoint {
115-
remote-endpoint = <&ltdc_ep0_out>;
116-
};
117-
};
118-
119-
port@1 {
120-
reg = <1>;
121-
dsi_out: endpoint {
122-
remote-endpoint = <&dsi_panel_in>;
123-
};
124-
};
125-
};
126-
127107
panel@0 {
128108
compatible = "raydium,rm68200";
129109
reg = <0>;
@@ -140,6 +120,14 @@
140120
};
141121
};
142122

123+
&dsi_in {
124+
remote-endpoint = <&ltdc_ep0_out>;
125+
};
126+
127+
&dsi_out {
128+
remote-endpoint = <&dsi_panel_in>;
129+
};
130+
143131
&ethernet0 {
144132
status = "okay";
145133
pinctrl-0 = <&ethernet0_rgmii_pins_a>;

0 commit comments

Comments
 (0)