Skip to content

Commit d59b294

Browse files
lumagandersson
lumag
authored and
andersson
committed
ARM: dts: qcom: msm8974: rename labels for DSI nodes
Currently in board files MDSS and HDMI nodes stay apart, because labels for HDMI nodes do not have the mdss_ prefix. It was found that grouping all display-related notes is more useful. To keep all display-related nodes close in the board files, change DSI node aliases from dsi_* to mdss_dsi_*. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Signed-off-by: Bjorn Andersson <andersson@kernel.org> Link: https://lore.kernel.org/r/20230531011623.3808538-15-dmitry.baryshkov@linaro.org
1 parent 6198772 commit d59b294

4 files changed

Lines changed: 50 additions & 42 deletions

File tree

‎arch/arm/boot/dts/qcom-apq8074-dragonboard.dts‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,15 @@
7171
};
7272
};
7373

74-
&dsi0 {
74+
&gpu {
75+
status = "okay";
76+
};
77+
78+
&mdss {
79+
status = "okay";
80+
};
81+
82+
&mdss_dsi0 {
7583
vdda-supply = <&pm8941_l2>;
7684
vdd-supply = <&pm8941_l22>;
7785
vddio-supply = <&pm8941_l12>;
@@ -88,18 +96,18 @@
8896

8997
port {
9098
panel_in: endpoint {
91-
remote-endpoint = <&dsi0_out>;
99+
remote-endpoint = <&mdss_dsi0_out>;
92100
};
93101
};
94102
};
95103
};
96104

97-
&dsi0_out {
105+
&mdss_dsi0_out {
98106
remote-endpoint = <&panel_in>;
99107
data-lanes = <0 1 2 3>;
100108
};
101109

102-
&dsi0_phy {
110+
&mdss_dsi0_phy {
103111
status = "okay";
104112

105113
vddio-supply = <&pm8941_l12>;

‎arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,11 @@
230230
};
231231
};
232232

233-
&dsi0 {
233+
&mdss {
234+
status = "okay";
235+
};
236+
237+
&mdss_dsi0 {
234238
status = "okay";
235239

236240
vdda-supply = <&pm8941_l2>;
@@ -246,27 +250,23 @@
246250

247251
port {
248252
panel_in: endpoint {
249-
remote-endpoint = <&dsi0_out>;
253+
remote-endpoint = <&mdss_dsi0_out>;
250254
};
251255
};
252256
};
253257
};
254258

255-
&dsi0_out {
259+
&mdss_dsi0_out {
256260
remote-endpoint = <&panel_in>;
257261
data-lanes = <0 1 2 3>;
258262
};
259263

260-
&dsi0_phy {
264+
&mdss_dsi0_phy {
261265
status = "okay";
262266

263267
vddio-supply = <&pm8941_l12>;
264268
};
265269

266-
&mdss {
267-
status = "okay";
268-
};
269-
270270
&pm8941_gpios {
271271
gpio_keys_pin_a: gpio-keys-active-state {
272272
pins = "gpio2", "gpio3";

‎arch/arm/boot/dts/qcom-msm8974.dtsi‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1836,10 +1836,10 @@
18361836
<&gcc GPLL0_VOTE>,
18371837
<&gcc GPLL1_VOTE>,
18381838
<&rpmcc RPM_SMD_GFX3D_CLK_SRC>,
1839-
<&dsi0_phy 1>,
1840-
<&dsi0_phy 0>,
1841-
<&dsi1_phy 1>,
1842-
<&dsi1_phy 0>,
1839+
<&mdss_dsi0_phy 1>,
1840+
<&mdss_dsi0_phy 0>,
1841+
<&mdss_dsi1_phy 1>,
1842+
<&mdss_dsi1_phy 0>,
18431843
<0>,
18441844
<0>,
18451845
<0>;
@@ -1904,20 +1904,20 @@
19041904
port@0 {
19051905
reg = <0>;
19061906
mdp5_intf1_out: endpoint {
1907-
remote-endpoint = <&dsi0_in>;
1907+
remote-endpoint = <&mdss_dsi0_in>;
19081908
};
19091909
};
19101910

19111911
port@1 {
19121912
reg = <1>;
19131913
mdp5_intf2_out: endpoint {
1914-
remote-endpoint = <&dsi1_in>;
1914+
remote-endpoint = <&mdss_dsi1_in>;
19151915
};
19161916
};
19171917
};
19181918
};
19191919

1920-
dsi0: dsi@fd922800 {
1920+
mdss_dsi0: dsi@fd922800 {
19211921
compatible = "qcom,msm8974-dsi-ctrl",
19221922
"qcom,mdss-dsi-ctrl";
19231923
reg = <0xfd922800 0x1f8>;
@@ -1927,7 +1927,7 @@
19271927
interrupts = <4>;
19281928

19291929
assigned-clocks = <&mmcc BYTE0_CLK_SRC>, <&mmcc PCLK0_CLK_SRC>;
1930-
assigned-clock-parents = <&dsi0_phy 0>, <&dsi0_phy 1>;
1930+
assigned-clock-parents = <&mdss_dsi0_phy 0>, <&mdss_dsi0_phy 1>;
19311931

19321932
clocks = <&mmcc MDSS_MDP_CLK>,
19331933
<&mmcc MDSS_AHB_CLK>,
@@ -1944,7 +1944,7 @@
19441944
"core",
19451945
"core_mmss";
19461946

1947-
phys = <&dsi0_phy>;
1947+
phys = <&mdss_dsi0_phy>;
19481948

19491949
status = "disabled";
19501950

@@ -1957,20 +1957,20 @@
19571957

19581958
port@0 {
19591959
reg = <0>;
1960-
dsi0_in: endpoint {
1960+
mdss_dsi0_in: endpoint {
19611961
remote-endpoint = <&mdp5_intf1_out>;
19621962
};
19631963
};
19641964

19651965
port@1 {
19661966
reg = <1>;
1967-
dsi0_out: endpoint {
1967+
mdss_dsi0_out: endpoint {
19681968
};
19691969
};
19701970
};
19711971
};
19721972

1973-
dsi0_phy: phy@fd922a00 {
1973+
mdss_dsi0_phy: phy@fd922a00 {
19741974
compatible = "qcom,dsi-phy-28nm-hpm";
19751975
reg = <0xfd922a00 0xd4>,
19761976
<0xfd922b00 0x280>,
@@ -1988,7 +1988,7 @@
19881988
status = "disabled";
19891989
};
19901990

1991-
dsi1: dsi@fd922e00 {
1991+
mdss_dsi1: dsi@fd922e00 {
19921992
compatible = "qcom,msm8974-dsi-ctrl",
19931993
"qcom,mdss-dsi-ctrl";
19941994
reg = <0xfd922e00 0x1f8>;
@@ -1998,7 +1998,7 @@
19981998
interrupts = <4>;
19991999

20002000
assigned-clocks = <&mmcc BYTE1_CLK_SRC>, <&mmcc PCLK1_CLK_SRC>;
2001-
assigned-clock-parents = <&dsi1_phy 0>, <&dsi1_phy 1>;
2001+
assigned-clock-parents = <&mdss_dsi1_phy 0>, <&mdss_dsi1_phy 1>;
20022002

20032003
clocks = <&mmcc MDSS_MDP_CLK>,
20042004
<&mmcc MDSS_AHB_CLK>,
@@ -2015,7 +2015,7 @@
20152015
"core",
20162016
"core_mmss";
20172017

2018-
phys = <&dsi1_phy>;
2018+
phys = <&mdss_dsi1_phy>;
20192019

20202020
status = "disabled";
20212021

@@ -2028,20 +2028,20 @@
20282028

20292029
port@0 {
20302030
reg = <0>;
2031-
dsi1_in: endpoint {
2031+
mdss_dsi1_in: endpoint {
20322032
remote-endpoint = <&mdp5_intf2_out>;
20332033
};
20342034
};
20352035

20362036
port@1 {
20372037
reg = <1>;
2038-
dsi1_out: endpoint {
2038+
mdss_dsi1_out: endpoint {
20392039
};
20402040
};
20412041
};
20422042
};
20432043

2044-
dsi1_phy: phy@fd923000 {
2044+
mdss_dsi1_phy: phy@fd923000 {
20452045
compatible = "qcom,dsi-phy-28nm-hpm";
20462046
reg = <0xfd923000 0xd4>,
20472047
<0xfd923100 0x280>,

‎arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,15 @@
329329
};
330330
};
331331

332-
&dsi0 {
332+
&gpu {
333+
status = "okay";
334+
};
335+
336+
&mdss {
337+
status = "okay";
338+
};
339+
340+
&mdss_dsi0 {
333341
status = "okay";
334342

335343
vdda-supply = <&pma8084_l2>;
@@ -351,31 +359,23 @@
351359

352360
port {
353361
panel_in: endpoint {
354-
remote-endpoint = <&dsi0_out>;
362+
remote-endpoint = <&mdss_dsi0_out>;
355363
};
356364
};
357365
};
358366
};
359367

360-
&dsi0_out {
368+
&mdss_dsi0_out {
361369
remote-endpoint = <&panel_in>;
362370
data-lanes = <0 1 2 3>;
363371
};
364372

365-
&dsi0_phy {
373+
&mdss_dsi0_phy {
366374
status = "okay";
367375

368376
vddio-supply = <&pma8084_l12>;
369377
};
370378

371-
&gpu {
372-
status = "okay";
373-
};
374-
375-
&mdss {
376-
status = "okay";
377-
};
378-
379379
&pma8084_gpios {
380380
gpio_keys_pin_a: gpio-keys-active-state {
381381
pins = "gpio2", "gpio3", "gpio5";

0 commit comments

Comments
 (0)