mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-07 00:59:06 +00:00
Code Issues Releases Wiki Activity

arm64: dts: qcom: msm8996: rename labels for DSI nodes

Browse source 
Currently in board files MDSS and DSI nodes stay apart, because labels
for DSI 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 labels 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-7-dmitry.baryshkov@linaro.org
This commit is contained in:
Dmitry Baryshkov 2023-05-31 04:16:15 +03:00 committed by Bjorn Andersson
parent 8b87d0585c
commit 8b764ed0d0
5 changed files with 62 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi
View file

@ -164,21 +164,6 @@ &camss {
vdda-supply = <&vreg_l2a_1p25>;
};
&dsi0 {
vdda-supply = <&vreg_l2a_1p25>;
vcca-supply = <&vreg_l22a_3p0>;
status = "okay";
};
&dsi0_out {
data-lanes = <0 1 2 3>;
};
&dsi0_phy {
vcca-supply = <&vreg_l28a_0p925>;
status = "okay";
};
&hsusb_phy1 {
vdd-supply = <&vreg_l28a_0p925>;
vdda-pll-supply = <&vreg_l12a_1p8>;
@ -201,6 +186,21 @@ &mdss {
status = "okay";
};
&mdss_dsi0 {
vdda-supply = <&vreg_l2a_1p25>;
vcca-supply = <&vreg_l22a_3p0>;
status = "okay";
};
&mdss_dsi0_out {
data-lanes = <0 1 2 3>;
};
&mdss_dsi0_phy {
vcca-supply = <&vreg_l28a_0p925>;
status = "okay";
};
&mmcc {
vdd-gfx-supply = <&vdd_gfx>;
};

22
arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
View file

@ -235,7 +235,15 @@ bluetooth: bluetooth {
};
};
&dsi0 {
&gpu {
status = "okay";
};
&mdss {
status = "okay";
};
&mdss_dsi0 {
status = "okay";
vdd-supply = <&vreg_l2a_1p25>;
@ -246,26 +254,18 @@ &dsi0 {
pinctrl-1 = <&mdss_dsi_sleep &mdss_te_sleep>;
};
&dsi0_out {
&mdss_dsi0_out {
status = "okay";
data-lanes = <0 1 2 3>;
};
&dsi0_phy {
&mdss_dsi0_phy {
status = "okay";
vcca-supply = <&vreg_l28a_0p925>;
};
&gpu {
status = "okay";
};
&mdss {
status = "okay";
};
&mmcc {
vdd-gfx-supply = <&vdd_gfx>;
};

18
arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
View file

@ -93,7 +93,13 @@ synaptics@20 {
};
&dsi0 {
&gpu {
zap-shader {
firmware-name = "qcom/msm8996/gemini/a530_zap.mbn";
};
};
&mdss_dsi0 {
status = "okay";
vdd-supply = <&vreg_l2a_1p25>;
@ -112,22 +118,16 @@ panel: panel@0 {
port {
panel_in: endpoint {
remote-endpoint = <&dsi0_out>;
remote-endpoint = <&mdss_dsi0_out>;
};
};
};
};
&dsi0_out {
&mdss_dsi0_out {
remote-endpoint = <&panel_in>;
};
&gpu {
zap-shader {
firmware-name = "qcom/msm8996/gemini/a530_zap.mbn";
};
};
&pmi8994_wled {
status = "okay";
};

36
arch/arm64/boot/dts/qcom/msm8996.dtsi
View file

@ -889,10 +889,10 @@ mmcc: clock-controller@8c0000 {
clocks = <&xo_board>,
<&gcc GPLL0>,
<&gcc GCC_MMSS_NOC_CFG_AHB_CLK>,
<&dsi0_phy 1>,
<&dsi0_phy 0>,
<&dsi1_phy 1>,
<&dsi1_phy 0>,
<&mdss_dsi0_phy 1>,
<&mdss_dsi0_phy 0>,
<&mdss_dsi1_phy 1>,
<&mdss_dsi1_phy 0>,
<&hdmi_phy>;
clock-names = "xo",
"gpll0",
@ -985,20 +985,20 @@ mdp5_intf3_out: endpoint {
port@1 {
reg = <1>;
mdp5_intf1_out: endpoint {
remote-endpoint = <&dsi0_in>;
remote-endpoint = <&mdss_dsi0_in>;
};
};
port@2 {
reg = <2>;
mdp5_intf2_out: endpoint {
remote-endpoint = <&dsi1_in>;
remote-endpoint = <&mdss_dsi1_in>;
};
};
};
};
dsi0: dsi@994000 {
mdss_dsi0: dsi@994000 {
compatible = "qcom,msm8996-dsi-ctrl",
"qcom,mdss-dsi-ctrl";
reg = <0x00994000 0x400>;
@ -1022,9 +1022,9 @@ dsi0: dsi@994000 {
"pixel",
"core";
assigned-clocks = <&mmcc BYTE0_CLK_SRC>, <&mmcc PCLK0_CLK_SRC>;
assigned-clock-parents = <&dsi0_phy 0>, <&dsi0_phy 1>;
assigned-clock-parents = <&mdss_dsi0_phy 0>, <&mdss_dsi0_phy 1>;
phys = <&dsi0_phy>;
phys = <&mdss_dsi0_phy>;
status = "disabled";
#address-cells = <1>;
@ -1036,20 +1036,20 @@ ports {
port@0 {
reg = <0>;
dsi0_in: endpoint {
mdss_dsi0_in: endpoint {
remote-endpoint = <&mdp5_intf1_out>;
};
};
port@1 {
reg = <1>;
dsi0_out: endpoint {
mdss_dsi0_out: endpoint {
};
};
};
};
dsi0_phy: phy@994400 {
mdss_dsi0_phy: phy@994400 {
compatible = "qcom,dsi-phy-14nm";
reg = <0x00994400 0x100>,
<0x00994500 0x300>,
@ -1066,7 +1066,7 @@ dsi0_phy: phy@994400 {
status = "disabled";
};
dsi1: dsi@996000 {
mdss_dsi1: dsi@996000 {
compatible = "qcom,msm8996-dsi-ctrl",
"qcom,mdss-dsi-ctrl";
reg = <0x00996000 0x400>;
@ -1090,9 +1090,9 @@ dsi1: dsi@996000 {
"pixel",
"core";
assigned-clocks = <&mmcc BYTE1_CLK_SRC>, <&mmcc PCLK1_CLK_SRC>;
assigned-clock-parents = <&dsi1_phy 0>, <&dsi1_phy 1>;
assigned-clock-parents = <&mdss_dsi1_phy 0>, <&mdss_dsi1_phy 1>;
phys = <&dsi1_phy>;
phys = <&mdss_dsi1_phy>;
status = "disabled";
#address-cells = <1>;
@ -1104,20 +1104,20 @@ ports {
port@0 {
reg = <0>;
dsi1_in: endpoint {
mdss_dsi1_in: endpoint {
remote-endpoint = <&mdp5_intf2_out>;
};
};
port@1 {
reg = <1>;
dsi1_out: endpoint {
mdss_dsi1_out: endpoint {
};
};
};
};
dsi1_phy: phy@996400 {
mdss_dsi1_phy: phy@996400 {
compatible = "qcom,dsi-phy-14nm";
reg = <0x00996400 0x100>,
<0x00996500 0x300>,

18
arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-natrium.dts
View file

@ -39,7 +39,13 @@ touchscreen@20 {
};
};
&dsi0 {
&gpu {
zap-shader {
firmware-name = "qcom/msm8996/natrium/a530_zap.mbn";
};
};
&mdss_dsi0 {
status = "okay";
vdda-supply = <&vreg_l2a_1p25>;
@ -57,22 +63,16 @@ panel: panel@0 {
port {
panel_in: endpoint {
remote-endpoint = <&dsi0_out>;
remote-endpoint = <&mdss_dsi0_out>;
};
};
};
};
&dsi0_out {
&mdss_dsi0_out {
remote-endpoint = <&panel_in>;
};
&gpu {
zap-shader {
firmware-name = "qcom/msm8996/natrium/a530_zap.mbn";
};
};
&mss_pil {
firmware-name = "qcom/msm8996/natrium/mba.mbn",
"qcom/msm8996/natrium/modem.mbn";