* [PATCH 01/14] arm64: dts: qcom: sc7280: Don't disable MDP explicitly
2023-05-31 1:16 [PATCH 00/14] arm/arm64: dts: qcom: MDSS nodes cleanup Dmitry Baryshkov
@ 2023-05-31 1:16 ` Dmitry Baryshkov
2023-05-31 9:38 ` Konrad Dybcio
2023-05-31 1:16 ` [PATCH 02/14] arm64: dts: qcom: sm8350-hdk: remove useless enablement of mdss_mdp Dmitry Baryshkov
` (13 subsequent siblings)
14 siblings, 1 reply; 30+ messages in thread
From: Dmitry Baryshkov @ 2023-05-31 1:16 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree
MDSS and all its subdevices are useless without DPU/MDP, so disabling
MDP doesn't make any sense. Remove explicit disabling of the DPU device.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi | 4 ----
arch/arm64/boot/dts/qcom/sc7280.dtsi | 2 --
2 files changed, 6 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi
index 5b1c175c47f1..9ea6636125ad 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi
@@ -467,10 +467,6 @@ &mdss_dp_out {
link-frequencies = /bits/ 64 <1620000000 2700000000 5400000000>;
};
-&mdss_mdp {
- status = "okay";
-};
-
/* NVMe drive, enabled on a per-board basis */
&pcie1 {
pinctrl-names = "default";
diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi
index 00547192215d..1aa3c6bf81f0 100644
--- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi
@@ -3881,8 +3881,6 @@ mdss_mdp: display-controller@ae01000 {
interrupt-parent = <&mdss>;
interrupts = <0>;
- status = "disabled";
-
ports {
#address-cells = <1>;
#size-cells = <0>;
--
2.39.2
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 01/14] arm64: dts: qcom: sc7280: Don't disable MDP explicitly
2023-05-31 1:16 ` [PATCH 01/14] arm64: dts: qcom: sc7280: Don't disable MDP explicitly Dmitry Baryshkov
@ 2023-05-31 9:38 ` Konrad Dybcio
0 siblings, 0 replies; 30+ messages in thread
From: Konrad Dybcio @ 2023-05-31 9:38 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree
On 31.05.2023 03:16, Dmitry Baryshkov wrote:
> MDSS and all its subdevices are useless without DPU/MDP, so disabling
> MDP doesn't make any sense. Remove explicit disabling of the DPU device.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi | 4 ----
> arch/arm64/boot/dts/qcom/sc7280.dtsi | 2 --
> 2 files changed, 6 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi
> index 5b1c175c47f1..9ea6636125ad 100644
> --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi
> @@ -467,10 +467,6 @@ &mdss_dp_out {
> link-frequencies = /bits/ 64 <1620000000 2700000000 5400000000>;
> };
>
> -&mdss_mdp {
> - status = "okay";
> -};
> -
> /* NVMe drive, enabled on a per-board basis */
> &pcie1 {
> pinctrl-names = "default";
> diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi
> index 00547192215d..1aa3c6bf81f0 100644
> --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi
> @@ -3881,8 +3881,6 @@ mdss_mdp: display-controller@ae01000 {
> interrupt-parent = <&mdss>;
> interrupts = <0>;
>
> - status = "disabled";
> -
> ports {
> #address-cells = <1>;
> #size-cells = <0>;
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 02/14] arm64: dts: qcom: sm8350-hdk: remove useless enablement of mdss_mdp
2023-05-31 1:16 [PATCH 00/14] arm/arm64: dts: qcom: MDSS nodes cleanup Dmitry Baryshkov
2023-05-31 1:16 ` [PATCH 01/14] arm64: dts: qcom: sc7280: Don't disable MDP explicitly Dmitry Baryshkov
@ 2023-05-31 1:16 ` Dmitry Baryshkov
2023-05-31 9:38 ` Konrad Dybcio
2023-05-31 1:16 ` [PATCH 03/14] arm64: dts: qcom: sm8450-hdk: " Dmitry Baryshkov
` (12 subsequent siblings)
14 siblings, 1 reply; 30+ messages in thread
From: Dmitry Baryshkov @ 2023-05-31 1:16 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree
The MDP/DPU device is not disabled by default, so there is not point in
enabling it in the board DTS file.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sm8350-hdk.dts b/arch/arm64/boot/dts/qcom/sm8350-hdk.dts
index d3788bd72ac3..61dd9663fabe 100644
--- a/arch/arm64/boot/dts/qcom/sm8350-hdk.dts
+++ b/arch/arm64/boot/dts/qcom/sm8350-hdk.dts
@@ -424,10 +424,6 @@ mdss_dp0_out: endpoint {
};
};
-&mdss_mdp {
- status = "okay";
-};
-
&mpss {
status = "okay";
firmware-name = "qcom/sm8350/modem.mbn";
--
2.39.2
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 02/14] arm64: dts: qcom: sm8350-hdk: remove useless enablement of mdss_mdp
2023-05-31 1:16 ` [PATCH 02/14] arm64: dts: qcom: sm8350-hdk: remove useless enablement of mdss_mdp Dmitry Baryshkov
@ 2023-05-31 9:38 ` Konrad Dybcio
0 siblings, 0 replies; 30+ messages in thread
From: Konrad Dybcio @ 2023-05-31 9:38 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree
On 31.05.2023 03:16, Dmitry Baryshkov wrote:
> The MDP/DPU device is not disabled by default, so there is not point in
> enabling it in the board DTS file.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sm8350-hdk.dts b/arch/arm64/boot/dts/qcom/sm8350-hdk.dts
> index d3788bd72ac3..61dd9663fabe 100644
> --- a/arch/arm64/boot/dts/qcom/sm8350-hdk.dts
> +++ b/arch/arm64/boot/dts/qcom/sm8350-hdk.dts
> @@ -424,10 +424,6 @@ mdss_dp0_out: endpoint {
> };
> };
>
> -&mdss_mdp {
> - status = "okay";
> -};
> -
> &mpss {
> status = "okay";
> firmware-name = "qcom/sm8350/modem.mbn";
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 03/14] arm64: dts: qcom: sm8450-hdk: remove useless enablement of mdss_mdp
2023-05-31 1:16 [PATCH 00/14] arm/arm64: dts: qcom: MDSS nodes cleanup Dmitry Baryshkov
2023-05-31 1:16 ` [PATCH 01/14] arm64: dts: qcom: sc7280: Don't disable MDP explicitly Dmitry Baryshkov
2023-05-31 1:16 ` [PATCH 02/14] arm64: dts: qcom: sm8350-hdk: remove useless enablement of mdss_mdp Dmitry Baryshkov
@ 2023-05-31 1:16 ` Dmitry Baryshkov
2023-05-31 9:38 ` Konrad Dybcio
2023-05-31 1:16 ` [PATCH 04/14] arm64: dts: qcom: qrb5165-rb5: " Dmitry Baryshkov
` (11 subsequent siblings)
14 siblings, 1 reply; 30+ messages in thread
From: Dmitry Baryshkov @ 2023-05-31 1:16 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree
The MDP/DPU device is not disabled by default, so there is not point in
enabling it in the board DTS file.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts
index d5aeb7319776..bc4c125d1832 100644
--- a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts
+++ b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts
@@ -568,10 +568,6 @@ mdss_dp0_out: endpoint {
};
};
-&mdss_mdp {
- status = "okay";
-};
-
&pcie0 {
status = "okay";
max-link-speed = <2>;
--
2.39.2
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 03/14] arm64: dts: qcom: sm8450-hdk: remove useless enablement of mdss_mdp
2023-05-31 1:16 ` [PATCH 03/14] arm64: dts: qcom: sm8450-hdk: " Dmitry Baryshkov
@ 2023-05-31 9:38 ` Konrad Dybcio
0 siblings, 0 replies; 30+ messages in thread
From: Konrad Dybcio @ 2023-05-31 9:38 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree
On 31.05.2023 03:16, Dmitry Baryshkov wrote:
> The MDP/DPU device is not disabled by default, so there is not point in
> enabling it in the board DTS file.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts
> index d5aeb7319776..bc4c125d1832 100644
> --- a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts
> +++ b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts
> @@ -568,10 +568,6 @@ mdss_dp0_out: endpoint {
> };
> };
>
> -&mdss_mdp {
> - status = "okay";
> -};
> -
> &pcie0 {
> status = "okay";
> max-link-speed = <2>;
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 04/14] arm64: dts: qcom: qrb5165-rb5: remove useless enablement of mdss_mdp
2023-05-31 1:16 [PATCH 00/14] arm/arm64: dts: qcom: MDSS nodes cleanup Dmitry Baryshkov
` (2 preceding siblings ...)
2023-05-31 1:16 ` [PATCH 03/14] arm64: dts: qcom: sm8450-hdk: " Dmitry Baryshkov
@ 2023-05-31 1:16 ` Dmitry Baryshkov
2023-05-31 9:39 ` Konrad Dybcio
2023-05-31 1:16 ` [PATCH 05/14] arm64: dts: qcom: msm8953: rename labels for DSI nodes Dmitry Baryshkov
` (10 subsequent siblings)
14 siblings, 1 reply; 30+ messages in thread
From: Dmitry Baryshkov @ 2023-05-31 1:16 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree
The MDP/DPU device is not disabled by default since the commit
0c25dad9f2a7 ("arm64: dts: qcom: sm8250: Don't disable MDP explicitly"),
so there is not point in enabling it in the board DTS file.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
index dd924331b0ee..dfcaac266456 100644
--- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
+++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
@@ -639,10 +639,6 @@ &mdss {
status = "okay";
};
-&mdss_mdp {
- status = "okay";
-};
-
&pm8150_adc {
xo-therm@4c {
reg = <ADC5_XO_THERM_100K_PU>;
--
2.39.2
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 04/14] arm64: dts: qcom: qrb5165-rb5: remove useless enablement of mdss_mdp
2023-05-31 1:16 ` [PATCH 04/14] arm64: dts: qcom: qrb5165-rb5: " Dmitry Baryshkov
@ 2023-05-31 9:39 ` Konrad Dybcio
0 siblings, 0 replies; 30+ messages in thread
From: Konrad Dybcio @ 2023-05-31 9:39 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree
On 31.05.2023 03:16, Dmitry Baryshkov wrote:
> The MDP/DPU device is not disabled by default since the commit
> 0c25dad9f2a7 ("arm64: dts: qcom: sm8250: Don't disable MDP explicitly"),
> so there is not point in enabling it in the board DTS file.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
> index dd924331b0ee..dfcaac266456 100644
> --- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
> +++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
> @@ -639,10 +639,6 @@ &mdss {
> status = "okay";
> };
>
> -&mdss_mdp {
> - status = "okay";
> -};
> -
> &pm8150_adc {
> xo-therm@4c {
> reg = <ADC5_XO_THERM_100K_PU>;
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 05/14] arm64: dts: qcom: msm8953: rename labels for DSI nodes
2023-05-31 1:16 [PATCH 00/14] arm/arm64: dts: qcom: MDSS nodes cleanup Dmitry Baryshkov
` (3 preceding siblings ...)
2023-05-31 1:16 ` [PATCH 04/14] arm64: dts: qcom: qrb5165-rb5: " Dmitry Baryshkov
@ 2023-05-31 1:16 ` Dmitry Baryshkov
2023-05-31 9:40 ` Konrad Dybcio
2023-05-31 1:16 ` [PATCH 06/14] arm64: dts: qcom: msm8996: " Dmitry Baryshkov
` (9 subsequent siblings)
14 siblings, 1 reply; 30+ messages in thread
From: Dmitry Baryshkov @ 2023-05-31 1:16 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree
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>
---
arch/arm64/boot/dts/qcom/msm8953.dtsi | 40 +++++++++++++--------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/msm8953.dtsi b/arch/arm64/boot/dts/qcom/msm8953.dtsi
index 7d193a467819..b711cf9a6dc0 100644
--- a/arch/arm64/boot/dts/qcom/msm8953.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8953.dtsi
@@ -766,10 +766,10 @@ gcc: clock-controller@1800000 {
#power-domain-cells = <1>;
clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>,
<&sleep_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>;
clock-names = "xo",
"sleep",
"dsi0pll",
@@ -851,20 +851,20 @@ ports {
port@0 {
reg = <0>;
mdp5_intf1_out: endpoint {
- remote-endpoint = <&dsi0_in>;
+ remote-endpoint = <&mdss_dsi0_in>;
};
};
port@1 {
reg = <1>;
mdp5_intf2_out: endpoint {
- remote-endpoint = <&dsi1_in>;
+ remote-endpoint = <&mdss_dsi1_in>;
};
};
};
};
- dsi0: dsi@1a94000 {
+ mdss_dsi0: dsi@1a94000 {
compatible = "qcom,msm8953-dsi-ctrl", "qcom,mdss-dsi-ctrl";
reg = <0x01a94000 0x400>;
reg-names = "dsi_ctrl";
@@ -874,8 +874,8 @@ dsi0: dsi@1a94000 {
assigned-clocks = <&gcc BYTE0_CLK_SRC>,
<&gcc PCLK0_CLK_SRC>;
- assigned-clock-parents = <&dsi0_phy 0>,
- <&dsi0_phy 1>;
+ assigned-clock-parents = <&mdss_dsi0_phy 0>,
+ <&mdss_dsi0_phy 1>;
clocks = <&gcc GCC_MDSS_MDP_CLK>,
<&gcc GCC_MDSS_AHB_CLK>,
@@ -890,7 +890,7 @@ dsi0: dsi@1a94000 {
"pixel",
"core";
- phys = <&dsi0_phy>;
+ phys = <&mdss_dsi0_phy>;
#address-cells = <1>;
#size-cells = <0>;
@@ -903,20 +903,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@1a94400 {
+ mdss_dsi0_phy: phy@1a94400 {
compatible = "qcom,dsi-phy-14nm-8953";
reg = <0x01a94400 0x100>,
<0x01a94500 0x300>,
@@ -934,7 +934,7 @@ dsi0_phy: phy@1a94400 {
status = "disabled";
};
- dsi1: dsi@1a96000 {
+ mdss_dsi1: dsi@1a96000 {
compatible = "qcom,msm8953-dsi-ctrl", "qcom,mdss-dsi-ctrl";
reg = <0x01a96000 0x400>;
reg-names = "dsi_ctrl";
@@ -944,8 +944,8 @@ dsi1: dsi@1a96000 {
assigned-clocks = <&gcc BYTE1_CLK_SRC>,
<&gcc PCLK1_CLK_SRC>;
- assigned-clock-parents = <&dsi1_phy 0>,
- <&dsi1_phy 1>;
+ assigned-clock-parents = <&mdss_dsi1_phy 0>,
+ <&mdss_dsi1_phy 1>;
clocks = <&gcc GCC_MDSS_MDP_CLK>,
<&gcc GCC_MDSS_AHB_CLK>,
@@ -960,7 +960,7 @@ dsi1: dsi@1a96000 {
"pixel",
"core";
- phys = <&dsi1_phy>;
+ phys = <&mdss_dsi1_phy>;
status = "disabled";
@@ -970,20 +970,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@1a96400 {
+ mdss_dsi1_phy: phy@1a96400 {
compatible = "qcom,dsi-phy-14nm-8953";
reg = <0x01a96400 0x100>,
<0x01a96500 0x300>,
--
2.39.2
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 05/14] arm64: dts: qcom: msm8953: rename labels for DSI nodes
2023-05-31 1:16 ` [PATCH 05/14] arm64: dts: qcom: msm8953: rename labels for DSI nodes Dmitry Baryshkov
@ 2023-05-31 9:40 ` Konrad Dybcio
0 siblings, 0 replies; 30+ messages in thread
From: Konrad Dybcio @ 2023-05-31 9:40 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree
On 31.05.2023 03:16, Dmitry Baryshkov wrote:
> 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>
Konrad
> arch/arm64/boot/dts/qcom/msm8953.dtsi | 40 +++++++++++++--------------
> 1 file changed, 20 insertions(+), 20 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/msm8953.dtsi b/arch/arm64/boot/dts/qcom/msm8953.dtsi
> index 7d193a467819..b711cf9a6dc0 100644
> --- a/arch/arm64/boot/dts/qcom/msm8953.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8953.dtsi
> @@ -766,10 +766,10 @@ gcc: clock-controller@1800000 {
> #power-domain-cells = <1>;
> clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>,
> <&sleep_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>;
> clock-names = "xo",
> "sleep",
> "dsi0pll",
> @@ -851,20 +851,20 @@ ports {
> port@0 {
> reg = <0>;
> mdp5_intf1_out: endpoint {
> - remote-endpoint = <&dsi0_in>;
> + remote-endpoint = <&mdss_dsi0_in>;
> };
> };
>
> port@1 {
> reg = <1>;
> mdp5_intf2_out: endpoint {
> - remote-endpoint = <&dsi1_in>;
> + remote-endpoint = <&mdss_dsi1_in>;
> };
> };
> };
> };
>
> - dsi0: dsi@1a94000 {
> + mdss_dsi0: dsi@1a94000 {
> compatible = "qcom,msm8953-dsi-ctrl", "qcom,mdss-dsi-ctrl";
> reg = <0x01a94000 0x400>;
> reg-names = "dsi_ctrl";
> @@ -874,8 +874,8 @@ dsi0: dsi@1a94000 {
>
> assigned-clocks = <&gcc BYTE0_CLK_SRC>,
> <&gcc PCLK0_CLK_SRC>;
> - assigned-clock-parents = <&dsi0_phy 0>,
> - <&dsi0_phy 1>;
> + assigned-clock-parents = <&mdss_dsi0_phy 0>,
> + <&mdss_dsi0_phy 1>;
>
> clocks = <&gcc GCC_MDSS_MDP_CLK>,
> <&gcc GCC_MDSS_AHB_CLK>,
> @@ -890,7 +890,7 @@ dsi0: dsi@1a94000 {
> "pixel",
> "core";
>
> - phys = <&dsi0_phy>;
> + phys = <&mdss_dsi0_phy>;
>
> #address-cells = <1>;
> #size-cells = <0>;
> @@ -903,20 +903,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@1a94400 {
> + mdss_dsi0_phy: phy@1a94400 {
> compatible = "qcom,dsi-phy-14nm-8953";
> reg = <0x01a94400 0x100>,
> <0x01a94500 0x300>,
> @@ -934,7 +934,7 @@ dsi0_phy: phy@1a94400 {
> status = "disabled";
> };
>
> - dsi1: dsi@1a96000 {
> + mdss_dsi1: dsi@1a96000 {
> compatible = "qcom,msm8953-dsi-ctrl", "qcom,mdss-dsi-ctrl";
> reg = <0x01a96000 0x400>;
> reg-names = "dsi_ctrl";
> @@ -944,8 +944,8 @@ dsi1: dsi@1a96000 {
>
> assigned-clocks = <&gcc BYTE1_CLK_SRC>,
> <&gcc PCLK1_CLK_SRC>;
> - assigned-clock-parents = <&dsi1_phy 0>,
> - <&dsi1_phy 1>;
> + assigned-clock-parents = <&mdss_dsi1_phy 0>,
> + <&mdss_dsi1_phy 1>;
>
> clocks = <&gcc GCC_MDSS_MDP_CLK>,
> <&gcc GCC_MDSS_AHB_CLK>,
> @@ -960,7 +960,7 @@ dsi1: dsi@1a96000 {
> "pixel",
> "core";
>
> - phys = <&dsi1_phy>;
> + phys = <&mdss_dsi1_phy>;
>
> status = "disabled";
>
> @@ -970,20 +970,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@1a96400 {
> + mdss_dsi1_phy: phy@1a96400 {
> compatible = "qcom,dsi-phy-14nm-8953";
> reg = <0x01a96400 0x100>,
> <0x01a96500 0x300>,
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 06/14] arm64: dts: qcom: msm8996: rename labels for DSI nodes
2023-05-31 1:16 [PATCH 00/14] arm/arm64: dts: qcom: MDSS nodes cleanup Dmitry Baryshkov
` (4 preceding siblings ...)
2023-05-31 1:16 ` [PATCH 05/14] arm64: dts: qcom: msm8953: rename labels for DSI nodes Dmitry Baryshkov
@ 2023-05-31 1:16 ` Dmitry Baryshkov
2023-05-31 9:41 ` Konrad Dybcio
2023-05-31 1:16 ` [PATCH 07/14] arm64: dts: qcom: sc7180: " Dmitry Baryshkov
` (8 subsequent siblings)
14 siblings, 1 reply; 30+ messages in thread
From: Dmitry Baryshkov @ 2023-05-31 1:16 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree
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>
---
.../boot/dts/qcom/msm8996-oneplus-common.dtsi | 30 ++++++++--------
.../boot/dts/qcom/msm8996-xiaomi-common.dtsi | 22 ++++++------
.../boot/dts/qcom/msm8996-xiaomi-gemini.dts | 18 +++++-----
arch/arm64/boot/dts/qcom/msm8996.dtsi | 36 +++++++++----------
.../dts/qcom/msm8996pro-xiaomi-natrium.dts | 18 +++++-----
5 files changed, 62 insertions(+), 62 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi
index 2adadc1e5b7c..ec5457508fe6 100644
--- a/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi
@@ -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>;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
index 1ce5df0a3405..47f55c7311e9 100644
--- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
@@ -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>;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
index 100123d51494..bdedcf9dff03 100644
--- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
+++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
@@ -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";
};
diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index f75932cc2a30..3855366ca89f 100644
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -891,10 +891,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",
@@ -987,20 +987,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>;
@@ -1024,9 +1024,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>;
@@ -1038,20 +1038,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>,
@@ -1068,7 +1068,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>;
@@ -1092,9 +1092,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>;
@@ -1106,20 +1106,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>,
diff --git a/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-natrium.dts b/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-natrium.dts
index d18d0b0eda95..7957c8823f0d 100644
--- a/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-natrium.dts
+++ b/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-natrium.dts
@@ -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";
--
2.39.2
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 06/14] arm64: dts: qcom: msm8996: rename labels for DSI nodes
2023-05-31 1:16 ` [PATCH 06/14] arm64: dts: qcom: msm8996: " Dmitry Baryshkov
@ 2023-05-31 9:41 ` Konrad Dybcio
0 siblings, 0 replies; 30+ messages in thread
From: Konrad Dybcio @ 2023-05-31 9:41 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree
On 31.05.2023 03:16, Dmitry Baryshkov wrote:
> 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>
Konrad
> .../boot/dts/qcom/msm8996-oneplus-common.dtsi | 30 ++++++++--------
> .../boot/dts/qcom/msm8996-xiaomi-common.dtsi | 22 ++++++------
> .../boot/dts/qcom/msm8996-xiaomi-gemini.dts | 18 +++++-----
> arch/arm64/boot/dts/qcom/msm8996.dtsi | 36 +++++++++----------
> .../dts/qcom/msm8996pro-xiaomi-natrium.dts | 18 +++++-----
> 5 files changed, 62 insertions(+), 62 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi
> index 2adadc1e5b7c..ec5457508fe6 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi
> @@ -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>;
> };
> diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
> index 1ce5df0a3405..47f55c7311e9 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
> @@ -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>;
> };
> diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
> index 100123d51494..bdedcf9dff03 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
> +++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
> @@ -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";
> };
> diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> index f75932cc2a30..3855366ca89f 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> @@ -891,10 +891,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",
> @@ -987,20 +987,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>;
> @@ -1024,9 +1024,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>;
> @@ -1038,20 +1038,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>,
> @@ -1068,7 +1068,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>;
> @@ -1092,9 +1092,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>;
> @@ -1106,20 +1106,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>,
> diff --git a/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-natrium.dts b/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-natrium.dts
> index d18d0b0eda95..7957c8823f0d 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-natrium.dts
> +++ b/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-natrium.dts
> @@ -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";
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 07/14] arm64: dts: qcom: sc7180: rename labels for DSI nodes
2023-05-31 1:16 [PATCH 00/14] arm/arm64: dts: qcom: MDSS nodes cleanup Dmitry Baryshkov
` (5 preceding siblings ...)
2023-05-31 1:16 ` [PATCH 06/14] arm64: dts: qcom: msm8996: " Dmitry Baryshkov
@ 2023-05-31 1:16 ` Dmitry Baryshkov
2023-05-31 9:42 ` Konrad Dybcio
2023-05-31 1:16 ` [PATCH 08/14] arm64: dts: qcom: sc7280: " Dmitry Baryshkov
` (7 subsequent siblings)
14 siblings, 1 reply; 30+ messages in thread
From: Dmitry Baryshkov @ 2023-05-31 1:16 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree
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>
---
.../boot/dts/qcom/sc7180-acer-aspire1.dts | 32 ++++++------
arch/arm64/boot/dts/qcom/sc7180-idp.dts | 14 ++---
.../qcom/sc7180-trogdor-parade-ps8640.dtsi | 10 ++--
.../qcom/sc7180-trogdor-quackingstick-r0.dts | 2 +-
.../qcom/sc7180-trogdor-quackingstick.dtsi | 52 +++++++++----------
.../dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi | 10 ++--
.../sc7180-trogdor-wormdingler-rev1-boe.dts | 2 +-
.../dts/qcom/sc7180-trogdor-wormdingler.dtsi | 46 ++++++++--------
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 28 +++++-----
arch/arm64/boot/dts/qcom/sc7180.dtsi | 22 ++++----
10 files changed, 109 insertions(+), 109 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts
index 2a80f4090085..b637b4270f88 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts
@@ -143,21 +143,6 @@ reg_tp_3p3: touchpad-regulator {
};
};
-&dsi0 {
- vdda-supply = <&vreg_l3c_1p2>;
- status = "okay";
-};
-
-&dsi0_out {
- remote-endpoint = <&sn65dsi86_in>;
- data-lanes = <0 1 2 3>;
-};
-
-&dsi_phy {
- vdds-supply = <&vreg_l4a_0p8>;
- status = "okay";
-};
-
&i2c2 {
clock-frequency = <400000>;
status = "okay";
@@ -269,7 +254,7 @@ port@0 {
reg = <0>;
sn65dsi86_in: endpoint {
- remote-endpoint = <&dsi0_out>;
+ remote-endpoint = <&mdss_dsi0_out>;
};
};
@@ -313,6 +298,21 @@ &mdss {
status = "okay";
};
+&mdss_dsi0 {
+ vdda-supply = <&vreg_l3c_1p2>;
+ status = "okay";
+};
+
+&mdss_dsi0_out {
+ remote-endpoint = <&sn65dsi86_in>;
+ data-lanes = <0 1 2 3>;
+};
+
+&mdss_dsi0_phy {
+ vdds-supply = <&vreg_l4a_0p8>;
+ status = "okay";
+};
+
&pm6150_adc {
thermistor@4e {
reg = <ADC5_AMUX_THM2_100K_PU>;
diff --git a/arch/arm64/boot/dts/qcom/sc7180-idp.dts b/arch/arm64/boot/dts/qcom/sc7180-idp.dts
index bd9ed03159cf..546db0d90630 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-idp.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-idp.dts
@@ -295,7 +295,11 @@ vreg_bob: bob {
};
};
-&dsi0 {
+&mdss {
+ status = "okay";
+};
+
+&mdss_dsi0 {
status = "okay";
vdda-supply = <&vreg_l3c_1p2>;
@@ -314,7 +318,7 @@ panel@0 {
port {
panel0_in: endpoint {
- remote-endpoint = <&dsi0_out>;
+ remote-endpoint = <&mdss_dsi0_out>;
};
};
};
@@ -329,15 +333,11 @@ endpoint {
};
};
-&dsi_phy {
+&mdss_dsi0_phy {
status = "okay";
vdds-supply = <&vreg_l4a_0p8>;
};
-&mdss {
- status = "okay";
-};
-
&qfprom {
vcc-supply = <&vreg_l11a_1p8>;
};
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi
index 5aa7949b5328..bede23369fed 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi
@@ -46,10 +46,6 @@ &pp3300_dx_edp {
/* ADDITIONS TO NODES DEFINED IN PARENT DEVICE TREE FILES */
-&dsi0_out {
- remote-endpoint = <&ps8640_in>;
-};
-
edp_brij_i2c: &i2c2 {
status = "okay";
clock-frequency = <400000>;
@@ -74,7 +70,7 @@ ports {
port@0 {
reg = <0>;
ps8640_in: endpoint {
- remote-endpoint = <&dsi0_out>;
+ remote-endpoint = <&mdss_dsi0_out>;
};
};
@@ -102,6 +98,10 @@ panel_in_edp: endpoint {
};
};
+&mdss_dsi0_out {
+ remote-endpoint = <&ps8640_in>;
+};
+
&tlmm {
edp_brij_ps8640_rst: edp-brij-ps8640-rst-state {
pins = "gpio11";
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick-r0.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick-r0.dts
index 5c81e44ed4a5..0a7f2286b541 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick-r0.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick-r0.dts
@@ -15,7 +15,7 @@ / {
compatible = "google,quackingstick-sku1537", "qcom,sc7180";
};
-&dsi_phy {
+&mdss_dsi0_phy {
qcom,phy-rescode-offset-top = /bits/ 8 <(-13) (-13) (-13) (-13) (-13)>;
qcom,phy-rescode-offset-bot = /bits/ 8 <(-13) (-13) (-13) (-13) (-13)>;
qcom,phy-drive-ldo-level = <375>;
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi
index 8e7b42f843d4..62ab6427dd65 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi
@@ -52,7 +52,31 @@ keyboard-controller {
};
};
-&dsi0 {
+&gpio_keys {
+ status = "okay";
+};
+
+&i2c4 {
+ status = "okay";
+ clock-frequency = <400000>;
+
+ ap_ts: touchscreen@10 {
+ compatible = "hid-over-i2c";
+ reg = <0x10>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&ts_int_l>, <&ts_reset_l>;
+
+ interrupt-parent = <&tlmm>;
+ interrupts = <9 IRQ_TYPE_LEVEL_LOW>;
+
+ post-power-on-delay-ms = <20>;
+ hid-descr-addr = <0x0001>;
+
+ vdd-supply = <&pp3300_ts>;
+ };
+};
+
+&mdss_dsi0 {
panel: panel@0 {
/* Compatible will be filled in per-board */
reg = <0>;
@@ -67,7 +91,7 @@ panel: panel@0 {
port {
panel_in: endpoint {
- remote-endpoint = <&dsi0_out>;
+ remote-endpoint = <&mdss_dsi0_out>;
};
};
};
@@ -82,30 +106,6 @@ endpoint {
};
};
-&gpio_keys {
- status = "okay";
-};
-
-&i2c4 {
- status = "okay";
- clock-frequency = <400000>;
-
- ap_ts: touchscreen@10 {
- compatible = "hid-over-i2c";
- reg = <0x10>;
- pinctrl-names = "default";
- pinctrl-0 = <&ts_int_l>, <&ts_reset_l>;
-
- interrupt-parent = <&tlmm>;
- interrupts = <9 IRQ_TYPE_LEVEL_LOW>;
-
- post-power-on-delay-ms = <20>;
- hid-descr-addr = <0x0001>;
-
- vdd-supply = <&pp3300_ts>;
- };
-};
-
&sdhc_2 {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi
index e52b8776755d..b0c3be4c3bb4 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi
@@ -27,10 +27,6 @@ &pp3300_dx_edp {
/* ADDITIONS TO NODES DEFINED IN PARENT DEVICE TREE FILES */
-&dsi0_out {
- remote-endpoint = <&sn65dsi86_in>;
-};
-
edp_brij_i2c: &i2c2 {
status = "okay";
clock-frequency = <400000>;
@@ -65,7 +61,7 @@ ports {
port@0 {
reg = <0>;
sn65dsi86_in: endpoint {
- remote-endpoint = <&dsi0_out>;
+ remote-endpoint = <&mdss_dsi0_out>;
};
};
@@ -95,6 +91,10 @@ panel_in_edp: endpoint {
};
};
+&mdss_dsi0_out {
+ remote-endpoint = <&sn65dsi86_in>;
+};
+
&tlmm {
edp_brij_irq: edp-brij-irq-state {
pins = "gpio11";
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-boe.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-boe.dts
index c5b0658bd632..6eeead70d3eb 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-boe.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-boe.dts
@@ -17,7 +17,7 @@ / {
compatible = "google,wormdingler-sku1024", "qcom,sc7180";
};
-&dsi_phy {
+&mdss_dsi0_phy {
qcom,phy-rescode-offset-top = /bits/ 8 <31 31 31 31 (-32)>;
qcom,phy-rescode-offset-bot = /bits/ 8 <31 31 31 31 (-32)>;
qcom,phy-drive-ldo-level = <450>;
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi
index 262d6691abd9..2efa8a4bcda6 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi
@@ -110,7 +110,28 @@ keyboard-controller {
};
};
-&dsi0 {
+&i2c4 {
+ status = "okay";
+ clock-frequency = <400000>;
+
+ ap_ts: touchscreen@1 {
+ compatible = "hid-over-i2c";
+ reg = <0x01>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&ts_int_l>;
+
+ interrupt-parent = <&tlmm>;
+ interrupts = <9 IRQ_TYPE_EDGE_FALLING>;
+
+ post-power-on-delay-ms = <70>;
+ hid-descr-addr = <0x0001>;
+
+ vdd-supply = <&pp3300_ts>;
+ vddl-supply = <&pp1800_ts>;
+ };
+};
+
+&mdss_dsi0 {
panel: panel@0 {
reg = <0>;
@@ -126,7 +147,7 @@ panel: panel@0 {
port {
panel_in: endpoint {
- remote-endpoint = <&dsi0_out>;
+ remote-endpoint = <&mdss_dsi0_out>;
};
};
};
@@ -141,27 +162,6 @@ endpoint {
};
};
-&i2c4 {
- status = "okay";
- clock-frequency = <400000>;
-
- ap_ts: touchscreen@1 {
- compatible = "hid-over-i2c";
- reg = <0x01>;
- pinctrl-names = "default";
- pinctrl-0 = <&ts_int_l>;
-
- interrupt-parent = <&tlmm>;
- interrupts = <9 IRQ_TYPE_EDGE_FALLING>;
-
- post-power-on-delay-ms = <70>;
- hid-descr-addr = <0x0001>;
-
- vdd-supply = <&pp3300_ts>;
- vddl-supply = <&pp1800_ts>;
- };
-};
-
&pm6150_adc {
skin-temp-thermistor@4d {
reg = <ADC5_AMUX_THM1_100K_PU>;
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
index 51d6c3502f3f..805fe1275e97 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
@@ -705,20 +705,6 @@ &camcc {
status = "disabled";
};
-&dsi0 {
- status = "okay";
- vdda-supply = <&vdda_mipi_dsi0_1p2>;
-};
-
-&dsi0_out {
- data-lanes = <0 1 2 3>;
-};
-
-&dsi_phy {
- status = "okay";
- vdds-supply = <&vdda_mipi_dsi0_pll>;
-};
-
ap_sar_sensor_i2c: &i2c5 {
clock-frequency = <400000>;
@@ -836,6 +822,20 @@ &mdss_dp_out {
link-frequencies = /bits/ 64 <1620000000 2700000000 5400000000>;
};
+&mdss_dsi0 {
+ status = "okay";
+ vdda-supply = <&vdda_mipi_dsi0_1p2>;
+};
+
+&mdss_dsi0_out {
+ data-lanes = <0 1 2 3>;
+};
+
+&mdss_dsi0_phy {
+ status = "okay";
+ vdds-supply = <&vdda_mipi_dsi0_pll>;
+};
+
&pm6150_adc {
charger-thermistor@4f {
reg = <ADC5_AMUX_THM3_100K_PU>;
diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
index 2c05b5a5d92b..34eff97f8630 100644
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
@@ -3005,7 +3005,7 @@ ports {
port@0 {
reg = <0>;
dpu_intf1_out: endpoint {
- remote-endpoint = <&dsi0_in>;
+ remote-endpoint = <&mdss_dsi0_in>;
};
};
@@ -3042,7 +3042,7 @@ opp-460000000 {
};
};
- dsi0: dsi@ae94000 {
+ mdss_dsi0: dsi@ae94000 {
compatible = "qcom,sc7180-dsi-ctrl",
"qcom,mdss-dsi-ctrl";
reg = <0 0x0ae94000 0 0x400>;
@@ -3065,12 +3065,12 @@ dsi0: dsi@ae94000 {
"bus";
assigned-clocks = <&dispcc DISP_CC_MDSS_BYTE0_CLK_SRC>, <&dispcc DISP_CC_MDSS_PCLK0_CLK_SRC>;
- assigned-clock-parents = <&dsi_phy 0>, <&dsi_phy 1>;
+ assigned-clock-parents = <&mdss_dsi0_phy 0>, <&mdss_dsi0_phy 1>;
operating-points-v2 = <&dsi_opp_table>;
power-domains = <&rpmhpd SC7180_CX>;
- phys = <&dsi_phy>;
+ phys = <&mdss_dsi0_phy>;
#address-cells = <1>;
#size-cells = <0>;
@@ -3083,14 +3083,14 @@ ports {
port@0 {
reg = <0>;
- dsi0_in: endpoint {
+ mdss_dsi0_in: endpoint {
remote-endpoint = <&dpu_intf1_out>;
};
};
port@1 {
reg = <1>;
- dsi0_out: endpoint {
+ mdss_dsi0_out: endpoint {
};
};
};
@@ -3115,13 +3115,13 @@ opp-358000000 {
};
};
- dsi_phy: phy@ae94400 {
+ mdss_dsi0_phy: phy@ae94400 {
compatible = "qcom,dsi-phy-10nm";
reg = <0 0x0ae94400 0 0x200>,
<0 0x0ae94600 0 0x280>,
<0 0x0ae94a00 0 0x1e0>;
- reg-names = "dsi_phy",
- "dsi_phy_lane",
+ reg-names = "dsi0_phy",
+ "dsi0_phy_lane",
"dsi_pll";
#clock-cells = <1>;
@@ -3212,8 +3212,8 @@ dispcc: clock-controller@af00000 {
reg = <0 0x0af00000 0 0x200000>;
clocks = <&rpmhcc RPMH_CXO_CLK>,
<&gcc GCC_DISP_GPLL0_CLK_SRC>,
- <&dsi_phy 0>,
- <&dsi_phy 1>,
+ <&mdss_dsi0_phy 0>,
+ <&mdss_dsi0_phy 1>,
<&dp_phy 0>,
<&dp_phy 1>;
clock-names = "bi_tcxo",
--
2.39.2
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 07/14] arm64: dts: qcom: sc7180: rename labels for DSI nodes
2023-05-31 1:16 ` [PATCH 07/14] arm64: dts: qcom: sc7180: " Dmitry Baryshkov
@ 2023-05-31 9:42 ` Konrad Dybcio
0 siblings, 0 replies; 30+ messages in thread
From: Konrad Dybcio @ 2023-05-31 9:42 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree
On 31.05.2023 03:16, Dmitry Baryshkov wrote:
> 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>
Konrad
> .../boot/dts/qcom/sc7180-acer-aspire1.dts | 32 ++++++------
> arch/arm64/boot/dts/qcom/sc7180-idp.dts | 14 ++---
> .../qcom/sc7180-trogdor-parade-ps8640.dtsi | 10 ++--
> .../qcom/sc7180-trogdor-quackingstick-r0.dts | 2 +-
> .../qcom/sc7180-trogdor-quackingstick.dtsi | 52 +++++++++----------
> .../dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi | 10 ++--
> .../sc7180-trogdor-wormdingler-rev1-boe.dts | 2 +-
> .../dts/qcom/sc7180-trogdor-wormdingler.dtsi | 46 ++++++++--------
> arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 28 +++++-----
> arch/arm64/boot/dts/qcom/sc7180.dtsi | 22 ++++----
> 10 files changed, 109 insertions(+), 109 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts
> index 2a80f4090085..b637b4270f88 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts
> +++ b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts
> @@ -143,21 +143,6 @@ reg_tp_3p3: touchpad-regulator {
> };
> };
>
> -&dsi0 {
> - vdda-supply = <&vreg_l3c_1p2>;
> - status = "okay";
> -};
> -
> -&dsi0_out {
> - remote-endpoint = <&sn65dsi86_in>;
> - data-lanes = <0 1 2 3>;
> -};
> -
> -&dsi_phy {
> - vdds-supply = <&vreg_l4a_0p8>;
> - status = "okay";
> -};
> -
> &i2c2 {
> clock-frequency = <400000>;
> status = "okay";
> @@ -269,7 +254,7 @@ port@0 {
> reg = <0>;
>
> sn65dsi86_in: endpoint {
> - remote-endpoint = <&dsi0_out>;
> + remote-endpoint = <&mdss_dsi0_out>;
> };
> };
>
> @@ -313,6 +298,21 @@ &mdss {
> status = "okay";
> };
>
> +&mdss_dsi0 {
> + vdda-supply = <&vreg_l3c_1p2>;
> + status = "okay";
> +};
> +
> +&mdss_dsi0_out {
> + remote-endpoint = <&sn65dsi86_in>;
> + data-lanes = <0 1 2 3>;
> +};
> +
> +&mdss_dsi0_phy {
> + vdds-supply = <&vreg_l4a_0p8>;
> + status = "okay";
> +};
> +
> &pm6150_adc {
> thermistor@4e {
> reg = <ADC5_AMUX_THM2_100K_PU>;
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-idp.dts b/arch/arm64/boot/dts/qcom/sc7180-idp.dts
> index bd9ed03159cf..546db0d90630 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180-idp.dts
> +++ b/arch/arm64/boot/dts/qcom/sc7180-idp.dts
> @@ -295,7 +295,11 @@ vreg_bob: bob {
> };
> };
>
> -&dsi0 {
> +&mdss {
> + status = "okay";
> +};
> +
> +&mdss_dsi0 {
> status = "okay";
>
> vdda-supply = <&vreg_l3c_1p2>;
> @@ -314,7 +318,7 @@ panel@0 {
>
> port {
> panel0_in: endpoint {
> - remote-endpoint = <&dsi0_out>;
> + remote-endpoint = <&mdss_dsi0_out>;
> };
> };
> };
> @@ -329,15 +333,11 @@ endpoint {
> };
> };
>
> -&dsi_phy {
> +&mdss_dsi0_phy {
> status = "okay";
> vdds-supply = <&vreg_l4a_0p8>;
> };
>
> -&mdss {
> - status = "okay";
> -};
> -
> &qfprom {
> vcc-supply = <&vreg_l11a_1p8>;
> };
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi
> index 5aa7949b5328..bede23369fed 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi
> @@ -46,10 +46,6 @@ &pp3300_dx_edp {
>
> /* ADDITIONS TO NODES DEFINED IN PARENT DEVICE TREE FILES */
>
> -&dsi0_out {
> - remote-endpoint = <&ps8640_in>;
> -};
> -
> edp_brij_i2c: &i2c2 {
> status = "okay";
> clock-frequency = <400000>;
> @@ -74,7 +70,7 @@ ports {
> port@0 {
> reg = <0>;
> ps8640_in: endpoint {
> - remote-endpoint = <&dsi0_out>;
> + remote-endpoint = <&mdss_dsi0_out>;
> };
> };
>
> @@ -102,6 +98,10 @@ panel_in_edp: endpoint {
> };
> };
>
> +&mdss_dsi0_out {
> + remote-endpoint = <&ps8640_in>;
> +};
> +
> &tlmm {
> edp_brij_ps8640_rst: edp-brij-ps8640-rst-state {
> pins = "gpio11";
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick-r0.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick-r0.dts
> index 5c81e44ed4a5..0a7f2286b541 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick-r0.dts
> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick-r0.dts
> @@ -15,7 +15,7 @@ / {
> compatible = "google,quackingstick-sku1537", "qcom,sc7180";
> };
>
> -&dsi_phy {
> +&mdss_dsi0_phy {
> qcom,phy-rescode-offset-top = /bits/ 8 <(-13) (-13) (-13) (-13) (-13)>;
> qcom,phy-rescode-offset-bot = /bits/ 8 <(-13) (-13) (-13) (-13) (-13)>;
> qcom,phy-drive-ldo-level = <375>;
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi
> index 8e7b42f843d4..62ab6427dd65 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi
> @@ -52,7 +52,31 @@ keyboard-controller {
> };
> };
>
> -&dsi0 {
> +&gpio_keys {
> + status = "okay";
> +};
> +
> +&i2c4 {
> + status = "okay";
> + clock-frequency = <400000>;
> +
> + ap_ts: touchscreen@10 {
> + compatible = "hid-over-i2c";
> + reg = <0x10>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&ts_int_l>, <&ts_reset_l>;
> +
> + interrupt-parent = <&tlmm>;
> + interrupts = <9 IRQ_TYPE_LEVEL_LOW>;
> +
> + post-power-on-delay-ms = <20>;
> + hid-descr-addr = <0x0001>;
> +
> + vdd-supply = <&pp3300_ts>;
> + };
> +};
> +
> +&mdss_dsi0 {
> panel: panel@0 {
> /* Compatible will be filled in per-board */
> reg = <0>;
> @@ -67,7 +91,7 @@ panel: panel@0 {
>
> port {
> panel_in: endpoint {
> - remote-endpoint = <&dsi0_out>;
> + remote-endpoint = <&mdss_dsi0_out>;
> };
> };
> };
> @@ -82,30 +106,6 @@ endpoint {
> };
> };
>
> -&gpio_keys {
> - status = "okay";
> -};
> -
> -&i2c4 {
> - status = "okay";
> - clock-frequency = <400000>;
> -
> - ap_ts: touchscreen@10 {
> - compatible = "hid-over-i2c";
> - reg = <0x10>;
> - pinctrl-names = "default";
> - pinctrl-0 = <&ts_int_l>, <&ts_reset_l>;
> -
> - interrupt-parent = <&tlmm>;
> - interrupts = <9 IRQ_TYPE_LEVEL_LOW>;
> -
> - post-power-on-delay-ms = <20>;
> - hid-descr-addr = <0x0001>;
> -
> - vdd-supply = <&pp3300_ts>;
> - };
> -};
> -
> &sdhc_2 {
> status = "okay";
> };
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi
> index e52b8776755d..b0c3be4c3bb4 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi
> @@ -27,10 +27,6 @@ &pp3300_dx_edp {
>
> /* ADDITIONS TO NODES DEFINED IN PARENT DEVICE TREE FILES */
>
> -&dsi0_out {
> - remote-endpoint = <&sn65dsi86_in>;
> -};
> -
> edp_brij_i2c: &i2c2 {
> status = "okay";
> clock-frequency = <400000>;
> @@ -65,7 +61,7 @@ ports {
> port@0 {
> reg = <0>;
> sn65dsi86_in: endpoint {
> - remote-endpoint = <&dsi0_out>;
> + remote-endpoint = <&mdss_dsi0_out>;
> };
> };
>
> @@ -95,6 +91,10 @@ panel_in_edp: endpoint {
> };
> };
>
> +&mdss_dsi0_out {
> + remote-endpoint = <&sn65dsi86_in>;
> +};
> +
> &tlmm {
> edp_brij_irq: edp-brij-irq-state {
> pins = "gpio11";
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-boe.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-boe.dts
> index c5b0658bd632..6eeead70d3eb 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-boe.dts
> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-boe.dts
> @@ -17,7 +17,7 @@ / {
> compatible = "google,wormdingler-sku1024", "qcom,sc7180";
> };
>
> -&dsi_phy {
> +&mdss_dsi0_phy {
> qcom,phy-rescode-offset-top = /bits/ 8 <31 31 31 31 (-32)>;
> qcom,phy-rescode-offset-bot = /bits/ 8 <31 31 31 31 (-32)>;
> qcom,phy-drive-ldo-level = <450>;
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi
> index 262d6691abd9..2efa8a4bcda6 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi
> @@ -110,7 +110,28 @@ keyboard-controller {
> };
> };
>
> -&dsi0 {
> +&i2c4 {
> + status = "okay";
> + clock-frequency = <400000>;
> +
> + ap_ts: touchscreen@1 {
> + compatible = "hid-over-i2c";
> + reg = <0x01>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&ts_int_l>;
> +
> + interrupt-parent = <&tlmm>;
> + interrupts = <9 IRQ_TYPE_EDGE_FALLING>;
> +
> + post-power-on-delay-ms = <70>;
> + hid-descr-addr = <0x0001>;
> +
> + vdd-supply = <&pp3300_ts>;
> + vddl-supply = <&pp1800_ts>;
> + };
> +};
> +
> +&mdss_dsi0 {
>
> panel: panel@0 {
> reg = <0>;
> @@ -126,7 +147,7 @@ panel: panel@0 {
>
> port {
> panel_in: endpoint {
> - remote-endpoint = <&dsi0_out>;
> + remote-endpoint = <&mdss_dsi0_out>;
> };
> };
> };
> @@ -141,27 +162,6 @@ endpoint {
> };
> };
>
> -&i2c4 {
> - status = "okay";
> - clock-frequency = <400000>;
> -
> - ap_ts: touchscreen@1 {
> - compatible = "hid-over-i2c";
> - reg = <0x01>;
> - pinctrl-names = "default";
> - pinctrl-0 = <&ts_int_l>;
> -
> - interrupt-parent = <&tlmm>;
> - interrupts = <9 IRQ_TYPE_EDGE_FALLING>;
> -
> - post-power-on-delay-ms = <70>;
> - hid-descr-addr = <0x0001>;
> -
> - vdd-supply = <&pp3300_ts>;
> - vddl-supply = <&pp1800_ts>;
> - };
> -};
> -
> &pm6150_adc {
> skin-temp-thermistor@4d {
> reg = <ADC5_AMUX_THM1_100K_PU>;
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
> index 51d6c3502f3f..805fe1275e97 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
> @@ -705,20 +705,6 @@ &camcc {
> status = "disabled";
> };
>
> -&dsi0 {
> - status = "okay";
> - vdda-supply = <&vdda_mipi_dsi0_1p2>;
> -};
> -
> -&dsi0_out {
> - data-lanes = <0 1 2 3>;
> -};
> -
> -&dsi_phy {
> - status = "okay";
> - vdds-supply = <&vdda_mipi_dsi0_pll>;
> -};
> -
> ap_sar_sensor_i2c: &i2c5 {
> clock-frequency = <400000>;
>
> @@ -836,6 +822,20 @@ &mdss_dp_out {
> link-frequencies = /bits/ 64 <1620000000 2700000000 5400000000>;
> };
>
> +&mdss_dsi0 {
> + status = "okay";
> + vdda-supply = <&vdda_mipi_dsi0_1p2>;
> +};
> +
> +&mdss_dsi0_out {
> + data-lanes = <0 1 2 3>;
> +};
> +
> +&mdss_dsi0_phy {
> + status = "okay";
> + vdds-supply = <&vdda_mipi_dsi0_pll>;
> +};
> +
> &pm6150_adc {
> charger-thermistor@4f {
> reg = <ADC5_AMUX_THM3_100K_PU>;
> diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
> index 2c05b5a5d92b..34eff97f8630 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
> @@ -3005,7 +3005,7 @@ ports {
> port@0 {
> reg = <0>;
> dpu_intf1_out: endpoint {
> - remote-endpoint = <&dsi0_in>;
> + remote-endpoint = <&mdss_dsi0_in>;
> };
> };
>
> @@ -3042,7 +3042,7 @@ opp-460000000 {
> };
> };
>
> - dsi0: dsi@ae94000 {
> + mdss_dsi0: dsi@ae94000 {
> compatible = "qcom,sc7180-dsi-ctrl",
> "qcom,mdss-dsi-ctrl";
> reg = <0 0x0ae94000 0 0x400>;
> @@ -3065,12 +3065,12 @@ dsi0: dsi@ae94000 {
> "bus";
>
> assigned-clocks = <&dispcc DISP_CC_MDSS_BYTE0_CLK_SRC>, <&dispcc DISP_CC_MDSS_PCLK0_CLK_SRC>;
> - assigned-clock-parents = <&dsi_phy 0>, <&dsi_phy 1>;
> + assigned-clock-parents = <&mdss_dsi0_phy 0>, <&mdss_dsi0_phy 1>;
>
> operating-points-v2 = <&dsi_opp_table>;
> power-domains = <&rpmhpd SC7180_CX>;
>
> - phys = <&dsi_phy>;
> + phys = <&mdss_dsi0_phy>;
>
> #address-cells = <1>;
> #size-cells = <0>;
> @@ -3083,14 +3083,14 @@ ports {
>
> port@0 {
> reg = <0>;
> - dsi0_in: endpoint {
> + mdss_dsi0_in: endpoint {
> remote-endpoint = <&dpu_intf1_out>;
> };
> };
>
> port@1 {
> reg = <1>;
> - dsi0_out: endpoint {
> + mdss_dsi0_out: endpoint {
> };
> };
> };
> @@ -3115,13 +3115,13 @@ opp-358000000 {
> };
> };
>
> - dsi_phy: phy@ae94400 {
> + mdss_dsi0_phy: phy@ae94400 {
> compatible = "qcom,dsi-phy-10nm";
> reg = <0 0x0ae94400 0 0x200>,
> <0 0x0ae94600 0 0x280>,
> <0 0x0ae94a00 0 0x1e0>;
> - reg-names = "dsi_phy",
> - "dsi_phy_lane",
> + reg-names = "dsi0_phy",
> + "dsi0_phy_lane",
> "dsi_pll";
>
> #clock-cells = <1>;
> @@ -3212,8 +3212,8 @@ dispcc: clock-controller@af00000 {
> reg = <0 0x0af00000 0 0x200000>;
> clocks = <&rpmhcc RPMH_CXO_CLK>,
> <&gcc GCC_DISP_GPLL0_CLK_SRC>,
> - <&dsi_phy 0>,
> - <&dsi_phy 1>,
> + <&mdss_dsi0_phy 0>,
> + <&mdss_dsi0_phy 1>,
> <&dp_phy 0>,
> <&dp_phy 1>;
> clock-names = "bi_tcxo",
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 08/14] arm64: dts: qcom: sc7280: rename labels for DSI nodes
2023-05-31 1:16 [PATCH 00/14] arm/arm64: dts: qcom: MDSS nodes cleanup Dmitry Baryshkov
` (6 preceding siblings ...)
2023-05-31 1:16 ` [PATCH 07/14] arm64: dts: qcom: sc7180: " Dmitry Baryshkov
@ 2023-05-31 1:16 ` Dmitry Baryshkov
2023-05-31 9:42 ` Konrad Dybcio
2023-05-31 1:16 ` [PATCH 09/14] arm64: dts: qcom: sc8180x: " Dmitry Baryshkov
` (6 subsequent siblings)
14 siblings, 1 reply; 30+ messages in thread
From: Dmitry Baryshkov @ 2023-05-31 1:16 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree
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>
---
arch/arm64/boot/dts/qcom/sc7280.dtsi | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi
index 1aa3c6bf81f0..2f5e73da8b6d 100644
--- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi
@@ -3888,7 +3888,7 @@ ports {
port@0 {
reg = <0>;
dpu_intf1_out: endpoint {
- remote-endpoint = <&dsi0_in>;
+ remote-endpoint = <&mdss_dsi0_in>;
};
};
@@ -3973,14 +3973,14 @@ ports {
port@0 {
reg = <0>;
- dsi0_in: endpoint {
+ mdss_dsi0_in: endpoint {
remote-endpoint = <&dpu_intf1_out>;
};
};
port@1 {
reg = <1>;
- dsi0_out: endpoint {
+ mdss_dsi0_out: endpoint {
};
};
};
--
2.39.2
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 08/14] arm64: dts: qcom: sc7280: rename labels for DSI nodes
2023-05-31 1:16 ` [PATCH 08/14] arm64: dts: qcom: sc7280: " Dmitry Baryshkov
@ 2023-05-31 9:42 ` Konrad Dybcio
0 siblings, 0 replies; 30+ messages in thread
From: Konrad Dybcio @ 2023-05-31 9:42 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree
On 31.05.2023 03:16, Dmitry Baryshkov wrote:
> 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>
Konrad
> arch/arm64/boot/dts/qcom/sc7280.dtsi | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi
> index 1aa3c6bf81f0..2f5e73da8b6d 100644
> --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi
> @@ -3888,7 +3888,7 @@ ports {
> port@0 {
> reg = <0>;
> dpu_intf1_out: endpoint {
> - remote-endpoint = <&dsi0_in>;
> + remote-endpoint = <&mdss_dsi0_in>;
> };
> };
>
> @@ -3973,14 +3973,14 @@ ports {
>
> port@0 {
> reg = <0>;
> - dsi0_in: endpoint {
> + mdss_dsi0_in: endpoint {
> remote-endpoint = <&dpu_intf1_out>;
> };
> };
>
> port@1 {
> reg = <1>;
> - dsi0_out: endpoint {
> + mdss_dsi0_out: endpoint {
> };
> };
> };
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 09/14] arm64: dts: qcom: sc8180x: rename labels for DSI nodes
2023-05-31 1:16 [PATCH 00/14] arm/arm64: dts: qcom: MDSS nodes cleanup Dmitry Baryshkov
` (7 preceding siblings ...)
2023-05-31 1:16 ` [PATCH 08/14] arm64: dts: qcom: sc7280: " Dmitry Baryshkov
@ 2023-05-31 1:16 ` Dmitry Baryshkov
2023-05-31 9:43 ` Konrad Dybcio
2023-05-31 1:16 ` [PATCH 10/14] arm64: dts: qcom: sdm630: " Dmitry Baryshkov
` (5 subsequent siblings)
14 siblings, 1 reply; 30+ messages in thread
From: Dmitry Baryshkov @ 2023-05-31 1:16 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree
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>
---
arch/arm64/boot/dts/qcom/sc8180x.dtsi | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sc8180x.dtsi b/arch/arm64/boot/dts/qcom/sc8180x.dtsi
index e8613a00fcab..ef970c3479ca 100644
--- a/arch/arm64/boot/dts/qcom/sc8180x.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8180x.dtsi
@@ -2732,14 +2732,14 @@ dpu_intf0_out: endpoint {
port@1 {
reg = <1>;
dpu_intf1_out: endpoint {
- remote-endpoint = <&dsi0_in>;
+ remote-endpoint = <&mdss_dsi0_in>;
};
};
port@2 {
reg = <2>;
dpu_intf2_out: endpoint {
- remote-endpoint = <&dsi1_in>;
+ remote-endpoint = <&mdss_dsi1_in>;
};
};
@@ -2783,7 +2783,7 @@ opp-460000000 {
};
};
- dsi0: dsi@ae94000 {
+ mdss_dsi0: dsi@ae94000 {
compatible = "qcom,mdss-dsi-ctrl";
reg = <0 0x0ae94000 0 0x400>;
reg-names = "dsi_ctrl";
@@ -2807,7 +2807,7 @@ dsi0: dsi@ae94000 {
operating-points-v2 = <&dsi_opp_table>;
power-domains = <&rpmhpd SC8180X_MMCX>;
- phys = <&dsi0_phy>;
+ phys = <&mdss_dsi0_phy>;
phy-names = "dsi";
status = "disabled";
@@ -2818,14 +2818,14 @@ ports {
port@0 {
reg = <0>;
- dsi0_in: endpoint {
+ mdss_dsi0_in: endpoint {
remote-endpoint = <&dpu_intf1_out>;
};
};
port@1 {
reg = <1>;
- dsi0_out: endpoint {
+ mdss_dsi0_out: endpoint {
};
};
};
@@ -2850,7 +2850,7 @@ opp-358000000 {
};
};
- dsi0_phy: dsi-phy@ae94400 {
+ mdss_dsi0_phy: dsi-phy@ae94400 {
compatible = "qcom,dsi-phy-7nm";
reg = <0 0x0ae94400 0 0x200>,
<0 0x0ae94600 0 0x280>,
@@ -2869,7 +2869,7 @@ dsi0_phy: dsi-phy@ae94400 {
status = "disabled";
};
- dsi1: dsi@ae96000 {
+ mdss_dsi1: dsi@ae96000 {
compatible = "qcom,mdss-dsi-ctrl";
reg = <0 0x0ae96000 0 0x400>;
reg-names = "dsi_ctrl";
@@ -2893,7 +2893,7 @@ dsi1: dsi@ae96000 {
operating-points-v2 = <&dsi_opp_table>;
power-domains = <&rpmhpd SC8180X_MMCX>;
- phys = <&dsi1_phy>;
+ phys = <&mdss_dsi1_phy>;
phy-names = "dsi";
status = "disabled";
@@ -2904,20 +2904,20 @@ ports {
port@0 {
reg = <0>;
- dsi1_in: endpoint {
+ mdss_dsi1_in: endpoint {
remote-endpoint = <&dpu_intf2_out>;
};
};
port@1 {
reg = <1>;
- dsi1_out: endpoint {
+ mdss_dsi1_out: endpoint {
};
};
};
};
- dsi1_phy: dsi-phy@ae96400 {
+ mdss_dsi1_phy: dsi-phy@ae96400 {
compatible = "qcom,dsi-phy-7nm";
reg = <0 0x0ae96400 0 0x200>,
<0 0x0ae96600 0 0x280>,
--
2.39.2
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 09/14] arm64: dts: qcom: sc8180x: rename labels for DSI nodes
2023-05-31 1:16 ` [PATCH 09/14] arm64: dts: qcom: sc8180x: " Dmitry Baryshkov
@ 2023-05-31 9:43 ` Konrad Dybcio
0 siblings, 0 replies; 30+ messages in thread
From: Konrad Dybcio @ 2023-05-31 9:43 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree
On 31.05.2023 03:16, Dmitry Baryshkov wrote:
> 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>
Konrad
> arch/arm64/boot/dts/qcom/sc8180x.dtsi | 24 ++++++++++++------------
> 1 file changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sc8180x.dtsi b/arch/arm64/boot/dts/qcom/sc8180x.dtsi
> index e8613a00fcab..ef970c3479ca 100644
> --- a/arch/arm64/boot/dts/qcom/sc8180x.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc8180x.dtsi
> @@ -2732,14 +2732,14 @@ dpu_intf0_out: endpoint {
> port@1 {
> reg = <1>;
> dpu_intf1_out: endpoint {
> - remote-endpoint = <&dsi0_in>;
> + remote-endpoint = <&mdss_dsi0_in>;
> };
> };
>
> port@2 {
> reg = <2>;
> dpu_intf2_out: endpoint {
> - remote-endpoint = <&dsi1_in>;
> + remote-endpoint = <&mdss_dsi1_in>;
> };
> };
>
> @@ -2783,7 +2783,7 @@ opp-460000000 {
> };
> };
>
> - dsi0: dsi@ae94000 {
> + mdss_dsi0: dsi@ae94000 {
> compatible = "qcom,mdss-dsi-ctrl";
> reg = <0 0x0ae94000 0 0x400>;
> reg-names = "dsi_ctrl";
> @@ -2807,7 +2807,7 @@ dsi0: dsi@ae94000 {
> operating-points-v2 = <&dsi_opp_table>;
> power-domains = <&rpmhpd SC8180X_MMCX>;
>
> - phys = <&dsi0_phy>;
> + phys = <&mdss_dsi0_phy>;
> phy-names = "dsi";
>
> status = "disabled";
> @@ -2818,14 +2818,14 @@ ports {
>
> port@0 {
> reg = <0>;
> - dsi0_in: endpoint {
> + mdss_dsi0_in: endpoint {
> remote-endpoint = <&dpu_intf1_out>;
> };
> };
>
> port@1 {
> reg = <1>;
> - dsi0_out: endpoint {
> + mdss_dsi0_out: endpoint {
> };
> };
> };
> @@ -2850,7 +2850,7 @@ opp-358000000 {
> };
> };
>
> - dsi0_phy: dsi-phy@ae94400 {
> + mdss_dsi0_phy: dsi-phy@ae94400 {
> compatible = "qcom,dsi-phy-7nm";
> reg = <0 0x0ae94400 0 0x200>,
> <0 0x0ae94600 0 0x280>,
> @@ -2869,7 +2869,7 @@ dsi0_phy: dsi-phy@ae94400 {
> status = "disabled";
> };
>
> - dsi1: dsi@ae96000 {
> + mdss_dsi1: dsi@ae96000 {
> compatible = "qcom,mdss-dsi-ctrl";
> reg = <0 0x0ae96000 0 0x400>;
> reg-names = "dsi_ctrl";
> @@ -2893,7 +2893,7 @@ dsi1: dsi@ae96000 {
> operating-points-v2 = <&dsi_opp_table>;
> power-domains = <&rpmhpd SC8180X_MMCX>;
>
> - phys = <&dsi1_phy>;
> + phys = <&mdss_dsi1_phy>;
> phy-names = "dsi";
>
> status = "disabled";
> @@ -2904,20 +2904,20 @@ ports {
>
> port@0 {
> reg = <0>;
> - dsi1_in: endpoint {
> + mdss_dsi1_in: endpoint {
> remote-endpoint = <&dpu_intf2_out>;
> };
> };
>
> port@1 {
> reg = <1>;
> - dsi1_out: endpoint {
> + mdss_dsi1_out: endpoint {
> };
> };
> };
> };
>
> - dsi1_phy: dsi-phy@ae96400 {
> + mdss_dsi1_phy: dsi-phy@ae96400 {
> compatible = "qcom,dsi-phy-7nm";
> reg = <0 0x0ae96400 0 0x200>,
> <0 0x0ae96600 0 0x280>,
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 10/14] arm64: dts: qcom: sdm630: rename labels for DSI nodes
2023-05-31 1:16 [PATCH 00/14] arm/arm64: dts: qcom: MDSS nodes cleanup Dmitry Baryshkov
` (8 preceding siblings ...)
2023-05-31 1:16 ` [PATCH 09/14] arm64: dts: qcom: sc8180x: " Dmitry Baryshkov
@ 2023-05-31 1:16 ` Dmitry Baryshkov
2023-05-31 9:43 ` Konrad Dybcio
2023-05-31 1:16 ` [PATCH 11/14] arm64: dts: qcom: sdm845: " Dmitry Baryshkov
` (4 subsequent siblings)
14 siblings, 1 reply; 30+ messages in thread
From: Dmitry Baryshkov @ 2023-05-31 1:16 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree
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>
---
.../boot/dts/qcom/sda660-inforce-ifc6560.dts | 16 ++++++-------
arch/arm64/boot/dts/qcom/sdm630.dtsi | 20 ++++++++--------
arch/arm64/boot/dts/qcom/sdm660.dtsi | 24 +++++++++----------
3 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts b/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts
index 7459525d9982..0b23d5bb3f26 100644
--- a/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts
+++ b/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts
@@ -134,7 +134,7 @@ port@0 {
reg = <0>;
adv7533_in: endpoint {
- remote-endpoint = <&dsi0_out>;
+ remote-endpoint = <&mdss_dsi0_out>;
};
};
@@ -183,25 +183,25 @@ bluetooth {
};
};
-&dsi0 {
+&mdss {
+ status = "okay";
+};
+
+&mdss_dsi0 {
status = "okay";
vdda-supply = <&vreg_l1a_1p225>;
};
-&dsi0_out {
+&mdss_dsi0_out {
remote-endpoint = <&adv7533_in>;
data-lanes = <0 1 2 3>;
};
-&dsi0_phy {
+&mdss_dsi0_phy {
status = "okay";
vcca-supply = <&vreg_l1b_0p925>;
};
-&mdss {
- status = "okay";
-};
-
&mmss_smmu {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi
index 897f2440c9c8..bba0f366ef03 100644
--- a/arch/arm64/boot/dts/qcom/sdm630.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi
@@ -1463,8 +1463,8 @@ mmcc: clock-controller@c8c0000 {
<&sleep_clk>,
<&gcc GCC_MMSS_GPLL0_CLK>,
<&gcc GCC_MMSS_GPLL0_DIV_CLK>,
- <&dsi0_phy 1>,
- <&dsi0_phy 0>,
+ <&mdss_dsi0_phy 1>,
+ <&mdss_dsi0_phy 0>,
<0>,
<0>,
<0>,
@@ -1536,7 +1536,7 @@ ports {
port@0 {
reg = <0>;
mdp5_intf1_out: endpoint {
- remote-endpoint = <&dsi0_in>;
+ remote-endpoint = <&mdss_dsi0_in>;
};
};
};
@@ -1572,7 +1572,7 @@ opp-412500000 {
};
};
- dsi0: dsi@c994000 {
+ mdss_dsi0: dsi@c994000 {
compatible = "qcom,sdm660-dsi-ctrl",
"qcom,mdss-dsi-ctrl";
reg = <0x0c994000 0x400>;
@@ -1586,8 +1586,8 @@ dsi0: dsi@c994000 {
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>;
clocks = <&mmcc MDSS_MDP_CLK>,
<&mmcc MDSS_BYTE0_CLK>,
@@ -1608,7 +1608,7 @@ dsi0: dsi@c994000 {
"pixel",
"core";
- phys = <&dsi0_phy>;
+ phys = <&mdss_dsi0_phy>;
status = "disabled";
@@ -1618,20 +1618,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@c994400 {
+ mdss_dsi0_phy: phy@c994400 {
compatible = "qcom,dsi-phy-14nm-660";
reg = <0x0c994400 0x100>,
<0x0c994500 0x300>,
diff --git a/arch/arm64/boot/dts/qcom/sdm660.dtsi b/arch/arm64/boot/dts/qcom/sdm660.dtsi
index f0f27fc12c18..f89b27c99f40 100644
--- a/arch/arm64/boot/dts/qcom/sdm660.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm660.dtsi
@@ -148,14 +148,14 @@ ports {
port@1 {
reg = <1>;
mdp5_intf2_out: endpoint {
- remote-endpoint = <&dsi1_in>;
+ remote-endpoint = <&mdss_dsi1_in>;
};
};
};
};
&mdss {
- dsi1: dsi@c996000 {
+ mdss_dsi1: dsi@c996000 {
compatible = "qcom,sdm660-dsi-ctrl",
"qcom,mdss-dsi-ctrl";
reg = <0x0c996000 0x400>;
@@ -170,8 +170,8 @@ dsi1: dsi@c996000 {
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>;
clocks = <&mmcc MDSS_MDP_CLK>,
<&mmcc MDSS_BYTE1_CLK>,
@@ -192,7 +192,7 @@ dsi1: dsi@c996000 {
"pixel",
"core";
- phys = <&dsi1_phy>;
+ phys = <&mdss_dsi1_phy>;
status = "disabled";
@@ -202,20 +202,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@c996400 {
+ mdss_dsi1_phy: phy@c996400 {
compatible = "qcom,dsi-phy-14nm-660";
reg = <0x0c996400 0x100>,
<0x0c996500 0x300>,
@@ -239,10 +239,10 @@ &mmcc {
<&sleep_clk>,
<&gcc GCC_MMSS_GPLL0_CLK>,
<&gcc GCC_MMSS_GPLL0_DIV_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>,
<0>,
<0>;
};
--
2.39.2
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 10/14] arm64: dts: qcom: sdm630: rename labels for DSI nodes
2023-05-31 1:16 ` [PATCH 10/14] arm64: dts: qcom: sdm630: " Dmitry Baryshkov
@ 2023-05-31 9:43 ` Konrad Dybcio
0 siblings, 0 replies; 30+ messages in thread
From: Konrad Dybcio @ 2023-05-31 9:43 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree
On 31.05.2023 03:16, Dmitry Baryshkov wrote:
> 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>
Konrad
> .../boot/dts/qcom/sda660-inforce-ifc6560.dts | 16 ++++++-------
> arch/arm64/boot/dts/qcom/sdm630.dtsi | 20 ++++++++--------
> arch/arm64/boot/dts/qcom/sdm660.dtsi | 24 +++++++++----------
> 3 files changed, 30 insertions(+), 30 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts b/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts
> index 7459525d9982..0b23d5bb3f26 100644
> --- a/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts
> +++ b/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts
> @@ -134,7 +134,7 @@ port@0 {
> reg = <0>;
>
> adv7533_in: endpoint {
> - remote-endpoint = <&dsi0_out>;
> + remote-endpoint = <&mdss_dsi0_out>;
> };
> };
>
> @@ -183,25 +183,25 @@ bluetooth {
> };
> };
>
> -&dsi0 {
> +&mdss {
> + status = "okay";
> +};
> +
> +&mdss_dsi0 {
> status = "okay";
> vdda-supply = <&vreg_l1a_1p225>;
> };
>
> -&dsi0_out {
> +&mdss_dsi0_out {
> remote-endpoint = <&adv7533_in>;
> data-lanes = <0 1 2 3>;
> };
>
> -&dsi0_phy {
> +&mdss_dsi0_phy {
> status = "okay";
> vcca-supply = <&vreg_l1b_0p925>;
> };
>
> -&mdss {
> - status = "okay";
> -};
> -
> &mmss_smmu {
> status = "okay";
> };
> diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi
> index 897f2440c9c8..bba0f366ef03 100644
> --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi
> @@ -1463,8 +1463,8 @@ mmcc: clock-controller@c8c0000 {
> <&sleep_clk>,
> <&gcc GCC_MMSS_GPLL0_CLK>,
> <&gcc GCC_MMSS_GPLL0_DIV_CLK>,
> - <&dsi0_phy 1>,
> - <&dsi0_phy 0>,
> + <&mdss_dsi0_phy 1>,
> + <&mdss_dsi0_phy 0>,
> <0>,
> <0>,
> <0>,
> @@ -1536,7 +1536,7 @@ ports {
> port@0 {
> reg = <0>;
> mdp5_intf1_out: endpoint {
> - remote-endpoint = <&dsi0_in>;
> + remote-endpoint = <&mdss_dsi0_in>;
> };
> };
> };
> @@ -1572,7 +1572,7 @@ opp-412500000 {
> };
> };
>
> - dsi0: dsi@c994000 {
> + mdss_dsi0: dsi@c994000 {
> compatible = "qcom,sdm660-dsi-ctrl",
> "qcom,mdss-dsi-ctrl";
> reg = <0x0c994000 0x400>;
> @@ -1586,8 +1586,8 @@ dsi0: dsi@c994000 {
>
> 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>;
>
> clocks = <&mmcc MDSS_MDP_CLK>,
> <&mmcc MDSS_BYTE0_CLK>,
> @@ -1608,7 +1608,7 @@ dsi0: dsi@c994000 {
> "pixel",
> "core";
>
> - phys = <&dsi0_phy>;
> + phys = <&mdss_dsi0_phy>;
>
> status = "disabled";
>
> @@ -1618,20 +1618,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@c994400 {
> + mdss_dsi0_phy: phy@c994400 {
> compatible = "qcom,dsi-phy-14nm-660";
> reg = <0x0c994400 0x100>,
> <0x0c994500 0x300>,
> diff --git a/arch/arm64/boot/dts/qcom/sdm660.dtsi b/arch/arm64/boot/dts/qcom/sdm660.dtsi
> index f0f27fc12c18..f89b27c99f40 100644
> --- a/arch/arm64/boot/dts/qcom/sdm660.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm660.dtsi
> @@ -148,14 +148,14 @@ ports {
> port@1 {
> reg = <1>;
> mdp5_intf2_out: endpoint {
> - remote-endpoint = <&dsi1_in>;
> + remote-endpoint = <&mdss_dsi1_in>;
> };
> };
> };
> };
>
> &mdss {
> - dsi1: dsi@c996000 {
> + mdss_dsi1: dsi@c996000 {
> compatible = "qcom,sdm660-dsi-ctrl",
> "qcom,mdss-dsi-ctrl";
> reg = <0x0c996000 0x400>;
> @@ -170,8 +170,8 @@ dsi1: dsi@c996000 {
>
> 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>;
>
> clocks = <&mmcc MDSS_MDP_CLK>,
> <&mmcc MDSS_BYTE1_CLK>,
> @@ -192,7 +192,7 @@ dsi1: dsi@c996000 {
> "pixel",
> "core";
>
> - phys = <&dsi1_phy>;
> + phys = <&mdss_dsi1_phy>;
>
> status = "disabled";
>
> @@ -202,20 +202,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@c996400 {
> + mdss_dsi1_phy: phy@c996400 {
> compatible = "qcom,dsi-phy-14nm-660";
> reg = <0x0c996400 0x100>,
> <0x0c996500 0x300>,
> @@ -239,10 +239,10 @@ &mmcc {
> <&sleep_clk>,
> <&gcc GCC_MMSS_GPLL0_CLK>,
> <&gcc GCC_MMSS_GPLL0_DIV_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>,
> <0>,
> <0>;
> };
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 11/14] arm64: dts: qcom: sdm845: rename labels for DSI nodes
2023-05-31 1:16 [PATCH 00/14] arm/arm64: dts: qcom: MDSS nodes cleanup Dmitry Baryshkov
` (9 preceding siblings ...)
2023-05-31 1:16 ` [PATCH 10/14] arm64: dts: qcom: sdm630: " Dmitry Baryshkov
@ 2023-05-31 1:16 ` Dmitry Baryshkov
2023-05-31 9:44 ` Konrad Dybcio
2023-05-31 1:16 ` [PATCH 12/14] arm64: dts: qcom: sm8250: " Dmitry Baryshkov
` (3 subsequent siblings)
14 siblings, 1 reply; 30+ messages in thread
From: Dmitry Baryshkov @ 2023-05-31 1:16 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree
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>
---
arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 40 ++++----
arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 98 +++++++++----------
arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 86 ++++++++--------
.../boot/dts/qcom/sdm845-oneplus-common.dtsi | 76 +++++++-------
.../boot/dts/qcom/sdm845-shift-axolotl.dts | 76 +++++++-------
.../dts/qcom/sdm845-sony-xperia-tama.dtsi | 74 +++++++-------
.../qcom/sdm845-xiaomi-beryllium-common.dtsi | 66 ++++++-------
.../boot/dts/qcom/sdm845-xiaomi-polaris.dts | 76 +++++++-------
arch/arm64/boot/dts/qcom/sdm845.dtsi | 36 +++----
9 files changed, 314 insertions(+), 314 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
index d05c511718df..1ce413263b7f 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
@@ -636,25 +636,6 @@ src_pp600_s3c: smps3 {
};
};
-&dsi0 {
- status = "okay";
- vdda-supply = <&vdda_mipi_dsi0_1p2>;
-
- ports {
- port@1 {
- endpoint {
- remote-endpoint = <&sn65dsi86_in>;
- data-lanes = <0 1 2 3>;
- };
- };
- };
-};
-
-&dsi0_phy {
- status = "okay";
- vdds-supply = <&vdda_mipi_dsi0_pll>;
-};
-
edp_brij_i2c: &i2c3 {
status = "okay";
clock-frequency = <400000>;
@@ -687,7 +668,7 @@ ports {
port@0 {
reg = <0>;
sn65dsi86_in: endpoint {
- remote-endpoint = <&dsi0_out>;
+ remote-endpoint = <&mdss_dsi0_out>;
};
};
@@ -767,6 +748,25 @@ &mdss {
status = "okay";
};
+&mdss_dsi0 {
+ status = "okay";
+ vdda-supply = <&vdda_mipi_dsi0_1p2>;
+
+ ports {
+ port@1 {
+ endpoint {
+ remote-endpoint = <&sn65dsi86_in>;
+ data-lanes = <0 1 2 3>;
+ };
+ };
+ };
+};
+
+&mdss_dsi0_phy {
+ status = "okay";
+ vdds-supply = <&vdda_mipi_dsi0_pll>;
+};
+
/*
* Cheza fw does not properly program the GPU aperture to allow the
* GPU to update the SMMU pagetables for context switches. Work
diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
index 4dea2c04b22f..fd183f74c216 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
@@ -415,53 +415,6 @@ &cdsp_pas {
firmware-name = "qcom/sdm845/cdsp.mbn";
};
-&dsi0 {
- status = "okay";
- vdda-supply = <&vreg_l26a_1p2>;
-
- qcom,dual-dsi-mode;
- qcom,master-dsi;
-
- ports {
- port@1 {
- endpoint {
- remote-endpoint = <<9611_a>;
- data-lanes = <0 1 2 3>;
- };
- };
- };
-};
-
-&dsi0_phy {
- status = "okay";
- vdds-supply = <&vreg_l1a_0p875>;
-};
-
-&dsi1 {
- vdda-supply = <&vreg_l26a_1p2>;
-
- qcom,dual-dsi-mode;
-
- /* DSI1 is slave, so use DSI0 clocks */
- assigned-clock-parents = <&dsi0_phy 0>, <&dsi0_phy 1>;
-
- status = "okay";
-
- ports {
- port@1 {
- endpoint {
- remote-endpoint = <<9611_b>;
- data-lanes = <0 1 2 3>;
- };
- };
- };
-};
-
-&dsi1_phy {
- vdds-supply = <&vreg_l1a_0p875>;
- status = "okay";
-};
-
&gcc {
protected-clocks = <GCC_QSPI_CORE_CLK>,
<GCC_QSPI_CORE_CLK_SRC>,
@@ -517,7 +470,7 @@ port@0 {
reg = <0>;
lt9611_a: endpoint {
- remote-endpoint = <&dsi0_out>;
+ remote-endpoint = <&mdss_dsi0_out>;
};
};
@@ -525,7 +478,7 @@ port@1 {
reg = <1>;
lt9611_b: endpoint {
- remote-endpoint = <&dsi1_out>;
+ remote-endpoint = <&mdss_dsi1_out>;
};
};
@@ -556,6 +509,53 @@ &mdss {
status = "okay";
};
+&mdss_dsi0 {
+ status = "okay";
+ vdda-supply = <&vreg_l26a_1p2>;
+
+ qcom,dual-dsi-mode;
+ qcom,master-dsi;
+
+ ports {
+ port@1 {
+ endpoint {
+ remote-endpoint = <<9611_a>;
+ data-lanes = <0 1 2 3>;
+ };
+ };
+ };
+};
+
+&mdss_dsi0_phy {
+ status = "okay";
+ vdds-supply = <&vreg_l1a_0p875>;
+};
+
+&mdss_dsi1 {
+ vdda-supply = <&vreg_l26a_1p2>;
+
+ qcom,dual-dsi-mode;
+
+ /* DSI1 is slave, so use DSI0 clocks */
+ assigned-clock-parents = <&mdss_dsi0_phy 0>, <&mdss_dsi0_phy 1>;
+
+ status = "okay";
+
+ ports {
+ port@1 {
+ endpoint {
+ remote-endpoint = <<9611_b>;
+ data-lanes = <0 1 2 3>;
+ };
+ };
+ };
+};
+
+&mdss_dsi1_phy {
+ vdds-supply = <&vreg_l1a_0p875>;
+ status = "okay";
+};
+
&mss_pil {
status = "okay";
firmware-name = "qcom/sdm845/mba.mbn", "qcom/sdm845/modem.mbn";
diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
index d1440b790fa6..b2d4336e764b 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
@@ -417,7 +417,43 @@ &cdsp_pas {
firmware-name = "qcom/sdm845/cdsp.mdt";
};
-&dsi0 {
+&gcc {
+ protected-clocks = <GCC_QSPI_CORE_CLK>,
+ <GCC_QSPI_CORE_CLK_SRC>,
+ <GCC_QSPI_CNOC_PERIPH_AHB_CLK>,
+ <GCC_LPASS_Q6_AXI_CLK>,
+ <GCC_LPASS_SWAY_CLK>;
+};
+
+&gmu {
+ status = "okay";
+};
+
+&gpu {
+ status = "okay";
+
+ zap-shader {
+ memory-region = <&gpu_mem>;
+ firmware-name = "qcom/sdm845/a630_zap.mbn";
+ };
+};
+
+&i2c10 {
+ status = "okay";
+ clock-frequency = <400000>;
+};
+
+&ipa {
+ qcom,gsi-loader = "self";
+ memory-region = <&ipa_fw_mem>;
+ status = "okay";
+};
+
+&mdss {
+ status = "okay";
+};
+
+&mdss_dsi0 {
status = "okay";
vdda-supply = <&vdda_mipi_dsi0_1p2>;
@@ -448,33 +484,33 @@ ports {
port@0 {
reg = <0>;
truly_in_0: endpoint {
- remote-endpoint = <&dsi0_out>;
+ remote-endpoint = <&mdss_dsi0_out>;
};
};
port@1 {
reg = <1>;
truly_in_1: endpoint {
- remote-endpoint = <&dsi1_out>;
+ remote-endpoint = <&mdss_dsi1_out>;
};
};
};
};
};
-&dsi0_phy {
+&mdss_dsi0_phy {
status = "okay";
vdds-supply = <&vdda_mipi_dsi0_pll>;
};
-&dsi1 {
+&mdss_dsi1 {
status = "okay";
vdda-supply = <&vdda_mipi_dsi1_1p2>;
qcom,dual-dsi-mode;
/* DSI1 is slave, so use DSI0 clocks */
- assigned-clock-parents = <&dsi0_phy 0>, <&dsi0_phy 1>;
+ assigned-clock-parents = <&mdss_dsi0_phy 0>, <&mdss_dsi0_phy 1>;
ports {
port@1 {
@@ -486,47 +522,11 @@ endpoint {
};
};
-&dsi1_phy {
+&mdss_dsi1_phy {
status = "okay";
vdds-supply = <&vdda_mipi_dsi1_pll>;
};
-&gcc {
- protected-clocks = <GCC_QSPI_CORE_CLK>,
- <GCC_QSPI_CORE_CLK_SRC>,
- <GCC_QSPI_CNOC_PERIPH_AHB_CLK>,
- <GCC_LPASS_Q6_AXI_CLK>,
- <GCC_LPASS_SWAY_CLK>;
-};
-
-&gmu {
- status = "okay";
-};
-
-&gpu {
- status = "okay";
-
- zap-shader {
- memory-region = <&gpu_mem>;
- firmware-name = "qcom/sdm845/a630_zap.mbn";
- };
-};
-
-&i2c10 {
- status = "okay";
- clock-frequency = <400000>;
-};
-
-&ipa {
- qcom,gsi-loader = "self";
- memory-region = <&ipa_fw_mem>;
- status = "okay";
-};
-
-&mdss {
- status = "okay";
-};
-
&mss_pil {
status = "okay";
firmware-name = "qcom/sdm845/mba.mbn", "qcom/sdm845/modem.mbn";
diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
index 5c384345c05d..7b1555af97b8 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
@@ -336,44 +336,6 @@ &cdsp_pas {
firmware-name = "qcom/sdm845/oneplus6/cdsp.mbn";
};
-&dsi0 {
- status = "okay";
- vdda-supply = <&vdda_mipi_dsi0_1p2>;
-
- /*
- * Both devices use different panels but all other properties
- * are common. Compatible line is declared in device dts.
- */
- display_panel: panel@0 {
- status = "disabled";
-
- reg = <0>;
-
- vddio-supply = <&vreg_l14a_1p88>;
-
- reset-gpios = <&tlmm 6 GPIO_ACTIVE_LOW>;
-
- pinctrl-names = "default";
- pinctrl-0 = <&panel_reset_pins &panel_te_pin &panel_esd_pin>;
-
- port {
- panel_in: endpoint {
- remote-endpoint = <&dsi0_out>;
- };
- };
- };
-};
-
-&dsi0_out {
- remote-endpoint = <&panel_in>;
- data-lanes = <0 1 2 3>;
-};
-
-&dsi0_phy {
- status = "okay";
- vdds-supply = <&vdda_mipi_dsi0_pll>;
-};
-
&gcc {
protected-clocks = <GCC_QSPI_CORE_CLK>,
<GCC_QSPI_CORE_CLK_SRC>,
@@ -452,6 +414,44 @@ &mdss {
status = "okay";
};
+&mdss_dsi0 {
+ status = "okay";
+ vdda-supply = <&vdda_mipi_dsi0_1p2>;
+
+ /*
+ * Both devices use different panels but all other properties
+ * are common. Compatible line is declared in device dts.
+ */
+ display_panel: panel@0 {
+ status = "disabled";
+
+ reg = <0>;
+
+ vddio-supply = <&vreg_l14a_1p88>;
+
+ reset-gpios = <&tlmm 6 GPIO_ACTIVE_LOW>;
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&panel_reset_pins &panel_te_pin &panel_esd_pin>;
+
+ port {
+ panel_in: endpoint {
+ remote-endpoint = <&mdss_dsi0_out>;
+ };
+ };
+ };
+};
+
+&mdss_dsi0_out {
+ remote-endpoint = <&panel_in>;
+ data-lanes = <0 1 2 3>;
+};
+
+&mdss_dsi0_phy {
+ status = "okay";
+ vdds-supply = <&vdda_mipi_dsi0_pll>;
+};
+
/* Modem/wifi */
&mss_pil {
status = "okay";
diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
index 1eaff964b202..91ae5e875d6d 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
@@ -411,44 +411,6 @@ &cdsp_pas {
firmware-name = "qcom/sdm845/axolotl/cdsp.mbn";
};
-&dsi0 {
- status = "okay";
- vdda-supply = <&vdda_mipi_dsi0_1p2>;
-
- panel@0 {
- compatible = "visionox,rm69299-shift";
- status = "okay";
- reg = <0>;
- vdda-supply = <&vreg_l14a_1p88>;
- vdd3p3-supply = <&vreg_l28a_3p0>;
-
- #address-cells = <1>;
- #size-cells = <0>;
-
- reset-gpios = <&tlmm 6 GPIO_ACTIVE_HIGH>;
-
- pinctrl-names = "default", "sleep";
- pinctrl-0 = <&sde_dsi_active &sde_te_active>;
- pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;
-
- port {
- panel_in_0: endpoint {
- remote-endpoint = <&dsi0_out>;
- };
- };
- };
-};
-
-&dsi0_out {
- remote-endpoint = <&panel_in_0>;
- data-lanes = <0 1 2 3>;
-};
-
-&dsi0_phy {
- status = "okay";
- vdds-supply = <&vdda_mipi_dsi0_pll>;
-};
-
&gcc {
protected-clocks = <GCC_QSPI_CORE_CLK>,
<GCC_QSPI_CORE_CLK_SRC>,
@@ -505,6 +467,44 @@ &mdss {
status = "okay";
};
+&mdss_dsi0 {
+ status = "okay";
+ vdda-supply = <&vdda_mipi_dsi0_1p2>;
+
+ panel@0 {
+ compatible = "visionox,rm69299-shift";
+ status = "okay";
+ reg = <0>;
+ vdda-supply = <&vreg_l14a_1p88>;
+ vdd3p3-supply = <&vreg_l28a_3p0>;
+
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ reset-gpios = <&tlmm 6 GPIO_ACTIVE_HIGH>;
+
+ pinctrl-names = "default", "sleep";
+ pinctrl-0 = <&sde_dsi_active &sde_te_active>;
+ pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;
+
+ port {
+ panel_in_0: endpoint {
+ remote-endpoint = <&mdss_dsi0_out>;
+ };
+ };
+ };
+};
+
+&mdss_dsi0_out {
+ remote-endpoint = <&panel_in_0>;
+ data-lanes = <0 1 2 3>;
+};
+
+&mdss_dsi0_phy {
+ status = "okay";
+ vdds-supply = <&vdda_mipi_dsi0_pll>;
+};
+
&mss_pil {
status = "okay";
firmware-name = "qcom/sdm845/axolotl/mba.mbn", "qcom/sdm845/axolotl/modem.mbn";
diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
index 420ffede3e80..3bc187a066ae 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
@@ -368,43 +368,6 @@ &cdsp_pas {
status = "okay";
};
-&dsi0 {
- vdda-supply = <&vreg_l26a_1p2>;
- status = "okay";
-
- panel: panel@0 {
- /* The compatible is assigned in device DTs. */
- reg = <0>;
-
- backlight = <&pmi8998_wled>;
- vddio-supply = <&vreg_l14a_1p8>;
- vsp-supply = <&lab>;
- vsn-supply = <&ibb>;
- panel-reset-gpios = <&tlmm 6 GPIO_ACTIVE_HIGH>;
- touch-reset-gpios = <&tlmm 99 GPIO_ACTIVE_HIGH>;
-
- pinctrl-0 = <&sde_dsi_active &sde_te_active_sleep>;
- pinctrl-1 = <&sde_dsi_sleep &sde_te_active_sleep>;
- pinctrl-names = "default", "sleep";
-
- port {
- panel_in: endpoint {
- remote-endpoint = <&dsi0_out>;
- };
- };
- };
-};
-
-&dsi0_out {
- remote-endpoint = <&panel_in>;
- data-lanes = <0 1 2 3>;
-};
-
-&dsi0_phy {
- vdds-supply = <&vreg_l1a_0p9>;
- status = "okay";
-};
-
&gcc {
protected-clocks = <GCC_QSPI_CORE_CLK>,
<GCC_QSPI_CORE_CLK_SRC>,
@@ -515,6 +478,43 @@ &mdss {
status = "okay";
};
+&mdss_dsi0 {
+ vdda-supply = <&vreg_l26a_1p2>;
+ status = "okay";
+
+ panel: panel@0 {
+ /* The compatible is assigned in device DTs. */
+ reg = <0>;
+
+ backlight = <&pmi8998_wled>;
+ vddio-supply = <&vreg_l14a_1p8>;
+ vsp-supply = <&lab>;
+ vsn-supply = <&ibb>;
+ panel-reset-gpios = <&tlmm 6 GPIO_ACTIVE_HIGH>;
+ touch-reset-gpios = <&tlmm 99 GPIO_ACTIVE_HIGH>;
+
+ pinctrl-0 = <&sde_dsi_active &sde_te_active_sleep>;
+ pinctrl-1 = <&sde_dsi_sleep &sde_te_active_sleep>;
+ pinctrl-names = "default", "sleep";
+
+ port {
+ panel_in: endpoint {
+ remote-endpoint = <&mdss_dsi0_out>;
+ };
+ };
+ };
+};
+
+&mdss_dsi0_out {
+ remote-endpoint = <&panel_in>;
+ data-lanes = <0 1 2 3>;
+};
+
+&mdss_dsi0_phy {
+ vdds-supply = <&vreg_l1a_0p9>;
+ status = "okay";
+};
+
&pm8998_gpios {
focus_n: focus-n-state {
pins = "gpio2";
diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
index 5ed975cc6ecb..8bac4b153cc9 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
@@ -223,39 +223,6 @@ &cdsp_pas {
firmware-name = "qcom/sdm845/beryllium/cdsp.mbn";
};
-&dsi0 {
- status = "okay";
- vdda-supply = <&vreg_l26a_1p2>;
-
- display_panel: panel@0 {
- reg = <0>;
- vddio-supply = <&vreg_l14a_1p8>;
- vddpos-supply = <&lab>;
- vddneg-supply = <&ibb>;
-
- backlight = <&pmi8998_wled>;
- reset-gpios = <&tlmm 6 GPIO_ACTIVE_LOW>;
-
- status = "disabled";
-
- port {
- panel_in_0: endpoint {
- remote-endpoint = <&dsi0_out>;
- };
- };
- };
-};
-
-&dsi0_out {
- remote-endpoint = <&panel_in_0>;
- data-lanes = <0 1 2 3>;
-};
-
-&dsi0_phy {
- status = "okay";
- vdds-supply = <&vreg_l1a_0p875>;
-};
-
&gcc {
protected-clocks = <GCC_QSPI_CORE_CLK>,
<GCC_QSPI_CORE_CLK_SRC>,
@@ -298,6 +265,39 @@ &mdss {
status = "okay";
};
+&mdss_dsi0 {
+ status = "okay";
+ vdda-supply = <&vreg_l26a_1p2>;
+
+ display_panel: panel@0 {
+ reg = <0>;
+ vddio-supply = <&vreg_l14a_1p8>;
+ vddpos-supply = <&lab>;
+ vddneg-supply = <&ibb>;
+
+ backlight = <&pmi8998_wled>;
+ reset-gpios = <&tlmm 6 GPIO_ACTIVE_LOW>;
+
+ status = "disabled";
+
+ port {
+ panel_in_0: endpoint {
+ remote-endpoint = <&mdss_dsi0_out>;
+ };
+ };
+ };
+};
+
+&mdss_dsi0_out {
+ remote-endpoint = <&panel_in_0>;
+ data-lanes = <0 1 2 3>;
+};
+
+&mdss_dsi0_phy {
+ status = "okay";
+ vdds-supply = <&vreg_l1a_0p875>;
+};
+
&mss_pil {
status = "okay";
firmware-name = "qcom/sdm845/beryllium/mba.mbn", "qcom/sdm845/beryllium/modem.mbn";
diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
index 576f0421824f..6db12abaa88d 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
@@ -373,44 +373,6 @@ &cdsp_pas {
status = "okay";
};
-&dsi0 {
- vdda-supply = <&vdda_mipi_dsi0_1p2>;
- status = "okay";
-
- display_panel: panel@0 {
- compatible = "jdi,fhd-nt35596s";
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <0>;
-
- reset-gpios = <&tlmm 6 GPIO_ACTIVE_LOW>;
- vddio-supply = <&vreg_l14a_1p8>;
- backlight = <&pmi8998_wled>;
- vddpos-supply = <&lab>;
- vddneg-supply = <&ibb>;
-
- pinctrl-names = "default", "sleep";
- pinctrl-0 = <&sde_dsi_active>;
- pinctrl-1 = <&sde_dsi_suspend>;
-
- port {
- panel_in: endpoint {
- remote-endpoint = <&dsi0_out>;
- };
- };
- };
-};
-
-&dsi0_out {
- remote-endpoint = <&panel_in>;
- data-lanes = <0 1 2 3>;
-};
-
-&dsi0_phy {
- vdds-supply = <&vdda_mipi_dsi0_pll>;
- status = "okay";
-};
-
&gcc {
protected-clocks = <GCC_QSPI_CORE_CLK>,
<GCC_QSPI_CORE_CLK_SRC>,
@@ -505,6 +467,44 @@ &mdss {
status = "okay";
};
+&mdss_dsi0 {
+ vdda-supply = <&vdda_mipi_dsi0_1p2>;
+ status = "okay";
+
+ display_panel: panel@0 {
+ compatible = "jdi,fhd-nt35596s";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0>;
+
+ reset-gpios = <&tlmm 6 GPIO_ACTIVE_LOW>;
+ vddio-supply = <&vreg_l14a_1p8>;
+ backlight = <&pmi8998_wled>;
+ vddpos-supply = <&lab>;
+ vddneg-supply = <&ibb>;
+
+ pinctrl-names = "default", "sleep";
+ pinctrl-0 = <&sde_dsi_active>;
+ pinctrl-1 = <&sde_dsi_suspend>;
+
+ port {
+ panel_in: endpoint {
+ remote-endpoint = <&mdss_dsi0_out>;
+ };
+ };
+ };
+};
+
+&mdss_dsi0_out {
+ remote-endpoint = <&panel_in>;
+ data-lanes = <0 1 2 3>;
+};
+
+&mdss_dsi0_phy {
+ vdds-supply = <&vdda_mipi_dsi0_pll>;
+ status = "okay";
+};
+
&mss_pil {
firmware-name = "qcom/sdm845/polaris/mba.mbn", "qcom/sdm845/polaris/modem.mbn";
status = "okay";
diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index 950305aad44d..29524c25b63d 100644
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -4510,14 +4510,14 @@ dpu_intf0_out: endpoint {
port@1 {
reg = <1>;
dpu_intf1_out: endpoint {
- remote-endpoint = <&dsi0_in>;
+ remote-endpoint = <&mdss_dsi0_in>;
};
};
port@2 {
reg = <2>;
dpu_intf2_out: endpoint {
- remote-endpoint = <&dsi1_in>;
+ remote-endpoint = <&mdss_dsi1_in>;
};
};
};
@@ -4617,7 +4617,7 @@ opp-810000000 {
};
};
- dsi0: dsi@ae94000 {
+ mdss_dsi0: dsi@ae94000 {
compatible = "qcom,sdm845-dsi-ctrl",
"qcom,mdss-dsi-ctrl";
reg = <0 0x0ae94000 0 0x400>;
@@ -4639,12 +4639,12 @@ dsi0: dsi@ae94000 {
"iface",
"bus";
assigned-clocks = <&dispcc DISP_CC_MDSS_BYTE0_CLK_SRC>, <&dispcc DISP_CC_MDSS_PCLK0_CLK_SRC>;
- assigned-clock-parents = <&dsi0_phy 0>, <&dsi0_phy 1>;
+ assigned-clock-parents = <&mdss_dsi0_phy 0>, <&mdss_dsi0_phy 1>;
operating-points-v2 = <&dsi_opp_table>;
power-domains = <&rpmhpd SDM845_CX>;
- phys = <&dsi0_phy>;
+ phys = <&mdss_dsi0_phy>;
status = "disabled";
@@ -4657,20 +4657,20 @@ ports {
port@0 {
reg = <0>;
- dsi0_in: endpoint {
+ mdss_dsi0_in: endpoint {
remote-endpoint = <&dpu_intf1_out>;
};
};
port@1 {
reg = <1>;
- dsi0_out: endpoint {
+ mdss_dsi0_out: endpoint {
};
};
};
};
- dsi0_phy: phy@ae94400 {
+ mdss_dsi0_phy: phy@ae94400 {
compatible = "qcom,dsi-phy-10nm";
reg = <0 0x0ae94400 0 0x200>,
<0 0x0ae94600 0 0x280>,
@@ -4689,7 +4689,7 @@ dsi0_phy: phy@ae94400 {
status = "disabled";
};
- dsi1: dsi@ae96000 {
+ mdss_dsi1: dsi@ae96000 {
compatible = "qcom,sdm845-dsi-ctrl",
"qcom,mdss-dsi-ctrl";
reg = <0 0x0ae96000 0 0x400>;
@@ -4711,12 +4711,12 @@ dsi1: dsi@ae96000 {
"iface",
"bus";
assigned-clocks = <&dispcc DISP_CC_MDSS_BYTE1_CLK_SRC>, <&dispcc DISP_CC_MDSS_PCLK1_CLK_SRC>;
- assigned-clock-parents = <&dsi1_phy 0>, <&dsi1_phy 1>;
+ assigned-clock-parents = <&mdss_dsi1_phy 0>, <&mdss_dsi1_phy 1>;
operating-points-v2 = <&dsi_opp_table>;
power-domains = <&rpmhpd SDM845_CX>;
- phys = <&dsi1_phy>;
+ phys = <&mdss_dsi1_phy>;
status = "disabled";
@@ -4729,20 +4729,20 @@ ports {
port@0 {
reg = <0>;
- dsi1_in: endpoint {
+ mdss_dsi1_in: endpoint {
remote-endpoint = <&dpu_intf2_out>;
};
};
port@1 {
reg = <1>;
- dsi1_out: endpoint {
+ mdss_dsi1_out: endpoint {
};
};
};
};
- dsi1_phy: phy@ae96400 {
+ mdss_dsi1_phy: phy@ae96400 {
compatible = "qcom,dsi-phy-10nm";
reg = <0 0x0ae96400 0 0x200>,
<0 0x0ae96600 0 0x280>,
@@ -4904,10 +4904,10 @@ dispcc: clock-controller@af00000 {
clocks = <&rpmhcc RPMH_CXO_CLK>,
<&gcc GCC_DISP_GPLL0_CLK_SRC>,
<&gcc GCC_DISP_GPLL0_DIV_CLK_SRC>,
- <&dsi0_phy 0>,
- <&dsi0_phy 1>,
- <&dsi1_phy 0>,
- <&dsi1_phy 1>,
+ <&mdss_dsi0_phy 0>,
+ <&mdss_dsi0_phy 1>,
+ <&mdss_dsi1_phy 0>,
+ <&mdss_dsi1_phy 1>,
<&dp_phy 0>,
<&dp_phy 1>;
clock-names = "bi_tcxo",
--
2.39.2
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 11/14] arm64: dts: qcom: sdm845: rename labels for DSI nodes
2023-05-31 1:16 ` [PATCH 11/14] arm64: dts: qcom: sdm845: " Dmitry Baryshkov
@ 2023-05-31 9:44 ` Konrad Dybcio
0 siblings, 0 replies; 30+ messages in thread
From: Konrad Dybcio @ 2023-05-31 9:44 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree
On 31.05.2023 03:16, Dmitry Baryshkov wrote:
> 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>
Konrad
> arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 40 ++++----
> arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 98 +++++++++----------
> arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 86 ++++++++--------
> .../boot/dts/qcom/sdm845-oneplus-common.dtsi | 76 +++++++-------
> .../boot/dts/qcom/sdm845-shift-axolotl.dts | 76 +++++++-------
> .../dts/qcom/sdm845-sony-xperia-tama.dtsi | 74 +++++++-------
> .../qcom/sdm845-xiaomi-beryllium-common.dtsi | 66 ++++++-------
> .../boot/dts/qcom/sdm845-xiaomi-polaris.dts | 76 +++++++-------
> arch/arm64/boot/dts/qcom/sdm845.dtsi | 36 +++----
> 9 files changed, 314 insertions(+), 314 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
> index d05c511718df..1ce413263b7f 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
> @@ -636,25 +636,6 @@ src_pp600_s3c: smps3 {
> };
> };
>
> -&dsi0 {
> - status = "okay";
> - vdda-supply = <&vdda_mipi_dsi0_1p2>;
> -
> - ports {
> - port@1 {
> - endpoint {
> - remote-endpoint = <&sn65dsi86_in>;
> - data-lanes = <0 1 2 3>;
> - };
> - };
> - };
> -};
> -
> -&dsi0_phy {
> - status = "okay";
> - vdds-supply = <&vdda_mipi_dsi0_pll>;
> -};
> -
> edp_brij_i2c: &i2c3 {
> status = "okay";
> clock-frequency = <400000>;
> @@ -687,7 +668,7 @@ ports {
> port@0 {
> reg = <0>;
> sn65dsi86_in: endpoint {
> - remote-endpoint = <&dsi0_out>;
> + remote-endpoint = <&mdss_dsi0_out>;
> };
> };
>
> @@ -767,6 +748,25 @@ &mdss {
> status = "okay";
> };
>
> +&mdss_dsi0 {
> + status = "okay";
> + vdda-supply = <&vdda_mipi_dsi0_1p2>;
> +
> + ports {
> + port@1 {
> + endpoint {
> + remote-endpoint = <&sn65dsi86_in>;
> + data-lanes = <0 1 2 3>;
> + };
> + };
> + };
> +};
> +
> +&mdss_dsi0_phy {
> + status = "okay";
> + vdds-supply = <&vdda_mipi_dsi0_pll>;
> +};
> +
> /*
> * Cheza fw does not properly program the GPU aperture to allow the
> * GPU to update the SMMU pagetables for context switches. Work
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
> index 4dea2c04b22f..fd183f74c216 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
> @@ -415,53 +415,6 @@ &cdsp_pas {
> firmware-name = "qcom/sdm845/cdsp.mbn";
> };
>
> -&dsi0 {
> - status = "okay";
> - vdda-supply = <&vreg_l26a_1p2>;
> -
> - qcom,dual-dsi-mode;
> - qcom,master-dsi;
> -
> - ports {
> - port@1 {
> - endpoint {
> - remote-endpoint = <<9611_a>;
> - data-lanes = <0 1 2 3>;
> - };
> - };
> - };
> -};
> -
> -&dsi0_phy {
> - status = "okay";
> - vdds-supply = <&vreg_l1a_0p875>;
> -};
> -
> -&dsi1 {
> - vdda-supply = <&vreg_l26a_1p2>;
> -
> - qcom,dual-dsi-mode;
> -
> - /* DSI1 is slave, so use DSI0 clocks */
> - assigned-clock-parents = <&dsi0_phy 0>, <&dsi0_phy 1>;
> -
> - status = "okay";
> -
> - ports {
> - port@1 {
> - endpoint {
> - remote-endpoint = <<9611_b>;
> - data-lanes = <0 1 2 3>;
> - };
> - };
> - };
> -};
> -
> -&dsi1_phy {
> - vdds-supply = <&vreg_l1a_0p875>;
> - status = "okay";
> -};
> -
> &gcc {
> protected-clocks = <GCC_QSPI_CORE_CLK>,
> <GCC_QSPI_CORE_CLK_SRC>,
> @@ -517,7 +470,7 @@ port@0 {
> reg = <0>;
>
> lt9611_a: endpoint {
> - remote-endpoint = <&dsi0_out>;
> + remote-endpoint = <&mdss_dsi0_out>;
> };
> };
>
> @@ -525,7 +478,7 @@ port@1 {
> reg = <1>;
>
> lt9611_b: endpoint {
> - remote-endpoint = <&dsi1_out>;
> + remote-endpoint = <&mdss_dsi1_out>;
> };
> };
>
> @@ -556,6 +509,53 @@ &mdss {
> status = "okay";
> };
>
> +&mdss_dsi0 {
> + status = "okay";
> + vdda-supply = <&vreg_l26a_1p2>;
> +
> + qcom,dual-dsi-mode;
> + qcom,master-dsi;
> +
> + ports {
> + port@1 {
> + endpoint {
> + remote-endpoint = <<9611_a>;
> + data-lanes = <0 1 2 3>;
> + };
> + };
> + };
> +};
> +
> +&mdss_dsi0_phy {
> + status = "okay";
> + vdds-supply = <&vreg_l1a_0p875>;
> +};
> +
> +&mdss_dsi1 {
> + vdda-supply = <&vreg_l26a_1p2>;
> +
> + qcom,dual-dsi-mode;
> +
> + /* DSI1 is slave, so use DSI0 clocks */
> + assigned-clock-parents = <&mdss_dsi0_phy 0>, <&mdss_dsi0_phy 1>;
> +
> + status = "okay";
> +
> + ports {
> + port@1 {
> + endpoint {
> + remote-endpoint = <<9611_b>;
> + data-lanes = <0 1 2 3>;
> + };
> + };
> + };
> +};
> +
> +&mdss_dsi1_phy {
> + vdds-supply = <&vreg_l1a_0p875>;
> + status = "okay";
> +};
> +
> &mss_pil {
> status = "okay";
> firmware-name = "qcom/sdm845/mba.mbn", "qcom/sdm845/modem.mbn";
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
> index d1440b790fa6..b2d4336e764b 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
> @@ -417,7 +417,43 @@ &cdsp_pas {
> firmware-name = "qcom/sdm845/cdsp.mdt";
> };
>
> -&dsi0 {
> +&gcc {
> + protected-clocks = <GCC_QSPI_CORE_CLK>,
> + <GCC_QSPI_CORE_CLK_SRC>,
> + <GCC_QSPI_CNOC_PERIPH_AHB_CLK>,
> + <GCC_LPASS_Q6_AXI_CLK>,
> + <GCC_LPASS_SWAY_CLK>;
> +};
> +
> +&gmu {
> + status = "okay";
> +};
> +
> +&gpu {
> + status = "okay";
> +
> + zap-shader {
> + memory-region = <&gpu_mem>;
> + firmware-name = "qcom/sdm845/a630_zap.mbn";
> + };
> +};
> +
> +&i2c10 {
> + status = "okay";
> + clock-frequency = <400000>;
> +};
> +
> +&ipa {
> + qcom,gsi-loader = "self";
> + memory-region = <&ipa_fw_mem>;
> + status = "okay";
> +};
> +
> +&mdss {
> + status = "okay";
> +};
> +
> +&mdss_dsi0 {
> status = "okay";
> vdda-supply = <&vdda_mipi_dsi0_1p2>;
>
> @@ -448,33 +484,33 @@ ports {
> port@0 {
> reg = <0>;
> truly_in_0: endpoint {
> - remote-endpoint = <&dsi0_out>;
> + remote-endpoint = <&mdss_dsi0_out>;
> };
> };
>
> port@1 {
> reg = <1>;
> truly_in_1: endpoint {
> - remote-endpoint = <&dsi1_out>;
> + remote-endpoint = <&mdss_dsi1_out>;
> };
> };
> };
> };
> };
>
> -&dsi0_phy {
> +&mdss_dsi0_phy {
> status = "okay";
> vdds-supply = <&vdda_mipi_dsi0_pll>;
> };
>
> -&dsi1 {
> +&mdss_dsi1 {
> status = "okay";
> vdda-supply = <&vdda_mipi_dsi1_1p2>;
>
> qcom,dual-dsi-mode;
>
> /* DSI1 is slave, so use DSI0 clocks */
> - assigned-clock-parents = <&dsi0_phy 0>, <&dsi0_phy 1>;
> + assigned-clock-parents = <&mdss_dsi0_phy 0>, <&mdss_dsi0_phy 1>;
>
> ports {
> port@1 {
> @@ -486,47 +522,11 @@ endpoint {
> };
> };
>
> -&dsi1_phy {
> +&mdss_dsi1_phy {
> status = "okay";
> vdds-supply = <&vdda_mipi_dsi1_pll>;
> };
>
> -&gcc {
> - protected-clocks = <GCC_QSPI_CORE_CLK>,
> - <GCC_QSPI_CORE_CLK_SRC>,
> - <GCC_QSPI_CNOC_PERIPH_AHB_CLK>,
> - <GCC_LPASS_Q6_AXI_CLK>,
> - <GCC_LPASS_SWAY_CLK>;
> -};
> -
> -&gmu {
> - status = "okay";
> -};
> -
> -&gpu {
> - status = "okay";
> -
> - zap-shader {
> - memory-region = <&gpu_mem>;
> - firmware-name = "qcom/sdm845/a630_zap.mbn";
> - };
> -};
> -
> -&i2c10 {
> - status = "okay";
> - clock-frequency = <400000>;
> -};
> -
> -&ipa {
> - qcom,gsi-loader = "self";
> - memory-region = <&ipa_fw_mem>;
> - status = "okay";
> -};
> -
> -&mdss {
> - status = "okay";
> -};
> -
> &mss_pil {
> status = "okay";
> firmware-name = "qcom/sdm845/mba.mbn", "qcom/sdm845/modem.mbn";
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
> index 5c384345c05d..7b1555af97b8 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
> @@ -336,44 +336,6 @@ &cdsp_pas {
> firmware-name = "qcom/sdm845/oneplus6/cdsp.mbn";
> };
>
> -&dsi0 {
> - status = "okay";
> - vdda-supply = <&vdda_mipi_dsi0_1p2>;
> -
> - /*
> - * Both devices use different panels but all other properties
> - * are common. Compatible line is declared in device dts.
> - */
> - display_panel: panel@0 {
> - status = "disabled";
> -
> - reg = <0>;
> -
> - vddio-supply = <&vreg_l14a_1p88>;
> -
> - reset-gpios = <&tlmm 6 GPIO_ACTIVE_LOW>;
> -
> - pinctrl-names = "default";
> - pinctrl-0 = <&panel_reset_pins &panel_te_pin &panel_esd_pin>;
> -
> - port {
> - panel_in: endpoint {
> - remote-endpoint = <&dsi0_out>;
> - };
> - };
> - };
> -};
> -
> -&dsi0_out {
> - remote-endpoint = <&panel_in>;
> - data-lanes = <0 1 2 3>;
> -};
> -
> -&dsi0_phy {
> - status = "okay";
> - vdds-supply = <&vdda_mipi_dsi0_pll>;
> -};
> -
> &gcc {
> protected-clocks = <GCC_QSPI_CORE_CLK>,
> <GCC_QSPI_CORE_CLK_SRC>,
> @@ -452,6 +414,44 @@ &mdss {
> status = "okay";
> };
>
> +&mdss_dsi0 {
> + status = "okay";
> + vdda-supply = <&vdda_mipi_dsi0_1p2>;
> +
> + /*
> + * Both devices use different panels but all other properties
> + * are common. Compatible line is declared in device dts.
> + */
> + display_panel: panel@0 {
> + status = "disabled";
> +
> + reg = <0>;
> +
> + vddio-supply = <&vreg_l14a_1p88>;
> +
> + reset-gpios = <&tlmm 6 GPIO_ACTIVE_LOW>;
> +
> + pinctrl-names = "default";
> + pinctrl-0 = <&panel_reset_pins &panel_te_pin &panel_esd_pin>;
> +
> + port {
> + panel_in: endpoint {
> + remote-endpoint = <&mdss_dsi0_out>;
> + };
> + };
> + };
> +};
> +
> +&mdss_dsi0_out {
> + remote-endpoint = <&panel_in>;
> + data-lanes = <0 1 2 3>;
> +};
> +
> +&mdss_dsi0_phy {
> + status = "okay";
> + vdds-supply = <&vdda_mipi_dsi0_pll>;
> +};
> +
> /* Modem/wifi */
> &mss_pil {
> status = "okay";
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
> index 1eaff964b202..91ae5e875d6d 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
> @@ -411,44 +411,6 @@ &cdsp_pas {
> firmware-name = "qcom/sdm845/axolotl/cdsp.mbn";
> };
>
> -&dsi0 {
> - status = "okay";
> - vdda-supply = <&vdda_mipi_dsi0_1p2>;
> -
> - panel@0 {
> - compatible = "visionox,rm69299-shift";
> - status = "okay";
> - reg = <0>;
> - vdda-supply = <&vreg_l14a_1p88>;
> - vdd3p3-supply = <&vreg_l28a_3p0>;
> -
> - #address-cells = <1>;
> - #size-cells = <0>;
> -
> - reset-gpios = <&tlmm 6 GPIO_ACTIVE_HIGH>;
> -
> - pinctrl-names = "default", "sleep";
> - pinctrl-0 = <&sde_dsi_active &sde_te_active>;
> - pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;
> -
> - port {
> - panel_in_0: endpoint {
> - remote-endpoint = <&dsi0_out>;
> - };
> - };
> - };
> -};
> -
> -&dsi0_out {
> - remote-endpoint = <&panel_in_0>;
> - data-lanes = <0 1 2 3>;
> -};
> -
> -&dsi0_phy {
> - status = "okay";
> - vdds-supply = <&vdda_mipi_dsi0_pll>;
> -};
> -
> &gcc {
> protected-clocks = <GCC_QSPI_CORE_CLK>,
> <GCC_QSPI_CORE_CLK_SRC>,
> @@ -505,6 +467,44 @@ &mdss {
> status = "okay";
> };
>
> +&mdss_dsi0 {
> + status = "okay";
> + vdda-supply = <&vdda_mipi_dsi0_1p2>;
> +
> + panel@0 {
> + compatible = "visionox,rm69299-shift";
> + status = "okay";
> + reg = <0>;
> + vdda-supply = <&vreg_l14a_1p88>;
> + vdd3p3-supply = <&vreg_l28a_3p0>;
> +
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + reset-gpios = <&tlmm 6 GPIO_ACTIVE_HIGH>;
> +
> + pinctrl-names = "default", "sleep";
> + pinctrl-0 = <&sde_dsi_active &sde_te_active>;
> + pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;
> +
> + port {
> + panel_in_0: endpoint {
> + remote-endpoint = <&mdss_dsi0_out>;
> + };
> + };
> + };
> +};
> +
> +&mdss_dsi0_out {
> + remote-endpoint = <&panel_in_0>;
> + data-lanes = <0 1 2 3>;
> +};
> +
> +&mdss_dsi0_phy {
> + status = "okay";
> + vdds-supply = <&vdda_mipi_dsi0_pll>;
> +};
> +
> &mss_pil {
> status = "okay";
> firmware-name = "qcom/sdm845/axolotl/mba.mbn", "qcom/sdm845/axolotl/modem.mbn";
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
> index 420ffede3e80..3bc187a066ae 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
> @@ -368,43 +368,6 @@ &cdsp_pas {
> status = "okay";
> };
>
> -&dsi0 {
> - vdda-supply = <&vreg_l26a_1p2>;
> - status = "okay";
> -
> - panel: panel@0 {
> - /* The compatible is assigned in device DTs. */
> - reg = <0>;
> -
> - backlight = <&pmi8998_wled>;
> - vddio-supply = <&vreg_l14a_1p8>;
> - vsp-supply = <&lab>;
> - vsn-supply = <&ibb>;
> - panel-reset-gpios = <&tlmm 6 GPIO_ACTIVE_HIGH>;
> - touch-reset-gpios = <&tlmm 99 GPIO_ACTIVE_HIGH>;
> -
> - pinctrl-0 = <&sde_dsi_active &sde_te_active_sleep>;
> - pinctrl-1 = <&sde_dsi_sleep &sde_te_active_sleep>;
> - pinctrl-names = "default", "sleep";
> -
> - port {
> - panel_in: endpoint {
> - remote-endpoint = <&dsi0_out>;
> - };
> - };
> - };
> -};
> -
> -&dsi0_out {
> - remote-endpoint = <&panel_in>;
> - data-lanes = <0 1 2 3>;
> -};
> -
> -&dsi0_phy {
> - vdds-supply = <&vreg_l1a_0p9>;
> - status = "okay";
> -};
> -
> &gcc {
> protected-clocks = <GCC_QSPI_CORE_CLK>,
> <GCC_QSPI_CORE_CLK_SRC>,
> @@ -515,6 +478,43 @@ &mdss {
> status = "okay";
> };
>
> +&mdss_dsi0 {
> + vdda-supply = <&vreg_l26a_1p2>;
> + status = "okay";
> +
> + panel: panel@0 {
> + /* The compatible is assigned in device DTs. */
> + reg = <0>;
> +
> + backlight = <&pmi8998_wled>;
> + vddio-supply = <&vreg_l14a_1p8>;
> + vsp-supply = <&lab>;
> + vsn-supply = <&ibb>;
> + panel-reset-gpios = <&tlmm 6 GPIO_ACTIVE_HIGH>;
> + touch-reset-gpios = <&tlmm 99 GPIO_ACTIVE_HIGH>;
> +
> + pinctrl-0 = <&sde_dsi_active &sde_te_active_sleep>;
> + pinctrl-1 = <&sde_dsi_sleep &sde_te_active_sleep>;
> + pinctrl-names = "default", "sleep";
> +
> + port {
> + panel_in: endpoint {
> + remote-endpoint = <&mdss_dsi0_out>;
> + };
> + };
> + };
> +};
> +
> +&mdss_dsi0_out {
> + remote-endpoint = <&panel_in>;
> + data-lanes = <0 1 2 3>;
> +};
> +
> +&mdss_dsi0_phy {
> + vdds-supply = <&vreg_l1a_0p9>;
> + status = "okay";
> +};
> +
> &pm8998_gpios {
> focus_n: focus-n-state {
> pins = "gpio2";
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
> index 5ed975cc6ecb..8bac4b153cc9 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
> @@ -223,39 +223,6 @@ &cdsp_pas {
> firmware-name = "qcom/sdm845/beryllium/cdsp.mbn";
> };
>
> -&dsi0 {
> - status = "okay";
> - vdda-supply = <&vreg_l26a_1p2>;
> -
> - display_panel: panel@0 {
> - reg = <0>;
> - vddio-supply = <&vreg_l14a_1p8>;
> - vddpos-supply = <&lab>;
> - vddneg-supply = <&ibb>;
> -
> - backlight = <&pmi8998_wled>;
> - reset-gpios = <&tlmm 6 GPIO_ACTIVE_LOW>;
> -
> - status = "disabled";
> -
> - port {
> - panel_in_0: endpoint {
> - remote-endpoint = <&dsi0_out>;
> - };
> - };
> - };
> -};
> -
> -&dsi0_out {
> - remote-endpoint = <&panel_in_0>;
> - data-lanes = <0 1 2 3>;
> -};
> -
> -&dsi0_phy {
> - status = "okay";
> - vdds-supply = <&vreg_l1a_0p875>;
> -};
> -
> &gcc {
> protected-clocks = <GCC_QSPI_CORE_CLK>,
> <GCC_QSPI_CORE_CLK_SRC>,
> @@ -298,6 +265,39 @@ &mdss {
> status = "okay";
> };
>
> +&mdss_dsi0 {
> + status = "okay";
> + vdda-supply = <&vreg_l26a_1p2>;
> +
> + display_panel: panel@0 {
> + reg = <0>;
> + vddio-supply = <&vreg_l14a_1p8>;
> + vddpos-supply = <&lab>;
> + vddneg-supply = <&ibb>;
> +
> + backlight = <&pmi8998_wled>;
> + reset-gpios = <&tlmm 6 GPIO_ACTIVE_LOW>;
> +
> + status = "disabled";
> +
> + port {
> + panel_in_0: endpoint {
> + remote-endpoint = <&mdss_dsi0_out>;
> + };
> + };
> + };
> +};
> +
> +&mdss_dsi0_out {
> + remote-endpoint = <&panel_in_0>;
> + data-lanes = <0 1 2 3>;
> +};
> +
> +&mdss_dsi0_phy {
> + status = "okay";
> + vdds-supply = <&vreg_l1a_0p875>;
> +};
> +
> &mss_pil {
> status = "okay";
> firmware-name = "qcom/sdm845/beryllium/mba.mbn", "qcom/sdm845/beryllium/modem.mbn";
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
> index 576f0421824f..6db12abaa88d 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
> @@ -373,44 +373,6 @@ &cdsp_pas {
> status = "okay";
> };
>
> -&dsi0 {
> - vdda-supply = <&vdda_mipi_dsi0_1p2>;
> - status = "okay";
> -
> - display_panel: panel@0 {
> - compatible = "jdi,fhd-nt35596s";
> - #address-cells = <1>;
> - #size-cells = <0>;
> - reg = <0>;
> -
> - reset-gpios = <&tlmm 6 GPIO_ACTIVE_LOW>;
> - vddio-supply = <&vreg_l14a_1p8>;
> - backlight = <&pmi8998_wled>;
> - vddpos-supply = <&lab>;
> - vddneg-supply = <&ibb>;
> -
> - pinctrl-names = "default", "sleep";
> - pinctrl-0 = <&sde_dsi_active>;
> - pinctrl-1 = <&sde_dsi_suspend>;
> -
> - port {
> - panel_in: endpoint {
> - remote-endpoint = <&dsi0_out>;
> - };
> - };
> - };
> -};
> -
> -&dsi0_out {
> - remote-endpoint = <&panel_in>;
> - data-lanes = <0 1 2 3>;
> -};
> -
> -&dsi0_phy {
> - vdds-supply = <&vdda_mipi_dsi0_pll>;
> - status = "okay";
> -};
> -
> &gcc {
> protected-clocks = <GCC_QSPI_CORE_CLK>,
> <GCC_QSPI_CORE_CLK_SRC>,
> @@ -505,6 +467,44 @@ &mdss {
> status = "okay";
> };
>
> +&mdss_dsi0 {
> + vdda-supply = <&vdda_mipi_dsi0_1p2>;
> + status = "okay";
> +
> + display_panel: panel@0 {
> + compatible = "jdi,fhd-nt35596s";
> + #address-cells = <1>;
> + #size-cells = <0>;
> + reg = <0>;
> +
> + reset-gpios = <&tlmm 6 GPIO_ACTIVE_LOW>;
> + vddio-supply = <&vreg_l14a_1p8>;
> + backlight = <&pmi8998_wled>;
> + vddpos-supply = <&lab>;
> + vddneg-supply = <&ibb>;
> +
> + pinctrl-names = "default", "sleep";
> + pinctrl-0 = <&sde_dsi_active>;
> + pinctrl-1 = <&sde_dsi_suspend>;
> +
> + port {
> + panel_in: endpoint {
> + remote-endpoint = <&mdss_dsi0_out>;
> + };
> + };
> + };
> +};
> +
> +&mdss_dsi0_out {
> + remote-endpoint = <&panel_in>;
> + data-lanes = <0 1 2 3>;
> +};
> +
> +&mdss_dsi0_phy {
> + vdds-supply = <&vdda_mipi_dsi0_pll>;
> + status = "okay";
> +};
> +
> &mss_pil {
> firmware-name = "qcom/sdm845/polaris/mba.mbn", "qcom/sdm845/polaris/modem.mbn";
> status = "okay";
> diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> index 950305aad44d..29524c25b63d 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> @@ -4510,14 +4510,14 @@ dpu_intf0_out: endpoint {
> port@1 {
> reg = <1>;
> dpu_intf1_out: endpoint {
> - remote-endpoint = <&dsi0_in>;
> + remote-endpoint = <&mdss_dsi0_in>;
> };
> };
>
> port@2 {
> reg = <2>;
> dpu_intf2_out: endpoint {
> - remote-endpoint = <&dsi1_in>;
> + remote-endpoint = <&mdss_dsi1_in>;
> };
> };
> };
> @@ -4617,7 +4617,7 @@ opp-810000000 {
> };
> };
>
> - dsi0: dsi@ae94000 {
> + mdss_dsi0: dsi@ae94000 {
> compatible = "qcom,sdm845-dsi-ctrl",
> "qcom,mdss-dsi-ctrl";
> reg = <0 0x0ae94000 0 0x400>;
> @@ -4639,12 +4639,12 @@ dsi0: dsi@ae94000 {
> "iface",
> "bus";
> assigned-clocks = <&dispcc DISP_CC_MDSS_BYTE0_CLK_SRC>, <&dispcc DISP_CC_MDSS_PCLK0_CLK_SRC>;
> - assigned-clock-parents = <&dsi0_phy 0>, <&dsi0_phy 1>;
> + assigned-clock-parents = <&mdss_dsi0_phy 0>, <&mdss_dsi0_phy 1>;
>
> operating-points-v2 = <&dsi_opp_table>;
> power-domains = <&rpmhpd SDM845_CX>;
>
> - phys = <&dsi0_phy>;
> + phys = <&mdss_dsi0_phy>;
>
> status = "disabled";
>
> @@ -4657,20 +4657,20 @@ ports {
>
> port@0 {
> reg = <0>;
> - dsi0_in: endpoint {
> + mdss_dsi0_in: endpoint {
> remote-endpoint = <&dpu_intf1_out>;
> };
> };
>
> port@1 {
> reg = <1>;
> - dsi0_out: endpoint {
> + mdss_dsi0_out: endpoint {
> };
> };
> };
> };
>
> - dsi0_phy: phy@ae94400 {
> + mdss_dsi0_phy: phy@ae94400 {
> compatible = "qcom,dsi-phy-10nm";
> reg = <0 0x0ae94400 0 0x200>,
> <0 0x0ae94600 0 0x280>,
> @@ -4689,7 +4689,7 @@ dsi0_phy: phy@ae94400 {
> status = "disabled";
> };
>
> - dsi1: dsi@ae96000 {
> + mdss_dsi1: dsi@ae96000 {
> compatible = "qcom,sdm845-dsi-ctrl",
> "qcom,mdss-dsi-ctrl";
> reg = <0 0x0ae96000 0 0x400>;
> @@ -4711,12 +4711,12 @@ dsi1: dsi@ae96000 {
> "iface",
> "bus";
> assigned-clocks = <&dispcc DISP_CC_MDSS_BYTE1_CLK_SRC>, <&dispcc DISP_CC_MDSS_PCLK1_CLK_SRC>;
> - assigned-clock-parents = <&dsi1_phy 0>, <&dsi1_phy 1>;
> + assigned-clock-parents = <&mdss_dsi1_phy 0>, <&mdss_dsi1_phy 1>;
>
> operating-points-v2 = <&dsi_opp_table>;
> power-domains = <&rpmhpd SDM845_CX>;
>
> - phys = <&dsi1_phy>;
> + phys = <&mdss_dsi1_phy>;
>
> status = "disabled";
>
> @@ -4729,20 +4729,20 @@ ports {
>
> port@0 {
> reg = <0>;
> - dsi1_in: endpoint {
> + mdss_dsi1_in: endpoint {
> remote-endpoint = <&dpu_intf2_out>;
> };
> };
>
> port@1 {
> reg = <1>;
> - dsi1_out: endpoint {
> + mdss_dsi1_out: endpoint {
> };
> };
> };
> };
>
> - dsi1_phy: phy@ae96400 {
> + mdss_dsi1_phy: phy@ae96400 {
> compatible = "qcom,dsi-phy-10nm";
> reg = <0 0x0ae96400 0 0x200>,
> <0 0x0ae96600 0 0x280>,
> @@ -4904,10 +4904,10 @@ dispcc: clock-controller@af00000 {
> clocks = <&rpmhcc RPMH_CXO_CLK>,
> <&gcc GCC_DISP_GPLL0_CLK_SRC>,
> <&gcc GCC_DISP_GPLL0_DIV_CLK_SRC>,
> - <&dsi0_phy 0>,
> - <&dsi0_phy 1>,
> - <&dsi1_phy 0>,
> - <&dsi1_phy 1>,
> + <&mdss_dsi0_phy 0>,
> + <&mdss_dsi0_phy 1>,
> + <&mdss_dsi1_phy 0>,
> + <&mdss_dsi1_phy 1>,
> <&dp_phy 0>,
> <&dp_phy 1>;
> clock-names = "bi_tcxo",
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 12/14] arm64: dts: qcom: sm8250: rename labels for DSI nodes
2023-05-31 1:16 [PATCH 00/14] arm/arm64: dts: qcom: MDSS nodes cleanup Dmitry Baryshkov
` (10 preceding siblings ...)
2023-05-31 1:16 ` [PATCH 11/14] arm64: dts: qcom: sdm845: " Dmitry Baryshkov
@ 2023-05-31 1:16 ` Dmitry Baryshkov
2023-05-31 9:45 ` Konrad Dybcio
2023-05-31 1:16 ` [PATCH 13/14] arm64: dts: qcom: msm8996: rename labels for HDMI nodes Dmitry Baryshkov
` (2 subsequent siblings)
14 siblings, 1 reply; 30+ messages in thread
From: Dmitry Baryshkov @ 2023-05-31 1:16 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree
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>
---
arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 52 +++----
.../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 40 ++---
.../dts/qcom/sm8250-xiaomi-elish-common.dtsi | 138 +++++++++---------
arch/arm64/boot/dts/qcom/sm8250.dtsi | 36 ++---
4 files changed, 133 insertions(+), 133 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
index dfcaac266456..9022ad726741 100644
--- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
+++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
@@ -535,30 +535,6 @@ &cdsp {
firmware-name = "qcom/sm8250/cdsp.mbn";
};
-&dsi0 {
- status = "okay";
- vdda-supply = <&vreg_l9a_1p2>;
-
-#if 0
- qcom,dual-dsi-mode;
- qcom,master-dsi;
-#endif
-
- ports {
- port@1 {
- endpoint {
- remote-endpoint = <<9611_a>;
- data-lanes = <0 1 2 3>;
- };
- };
- };
-};
-
-&dsi0_phy {
- status = "okay";
- vdds-supply = <&vreg_l5a_0p88>;
-};
-
&gmu {
status = "okay";
};
@@ -604,7 +580,7 @@ port@0 {
reg = <0>;
lt9611_a: endpoint {
- remote-endpoint = <&dsi0_out>;
+ remote-endpoint = <&mdss_dsi0_out>;
};
};
@@ -613,7 +589,7 @@ port@1 {
reg = <1>;
lt9611_b: endpoint {
- remote-endpoint = <&dsi1_out>;
+ remote-endpoint = <&mdss_dsi1_out>;
};
};
#endif
@@ -639,6 +615,30 @@ &mdss {
status = "okay";
};
+&mdss_dsi0 {
+ status = "okay";
+ vdda-supply = <&vreg_l9a_1p2>;
+
+#if 0
+ qcom,dual-dsi-mode;
+ qcom,master-dsi;
+#endif
+
+ ports {
+ port@1 {
+ endpoint {
+ remote-endpoint = <<9611_a>;
+ data-lanes = <0 1 2 3>;
+ };
+ };
+ };
+};
+
+&mdss_dsi0_phy {
+ status = "okay";
+ vdds-supply = <&vreg_l5a_0p88>;
+};
+
&pm8150_adc {
xo-therm@4c {
reg = <ADC5_XO_THERM_100K_PU>;
diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
index 1326c171fe72..cfbc4fc1eba9 100644
--- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
+++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
@@ -311,25 +311,6 @@ &cdsp_pas {
status = "okay";
};
-&dsi0 {
- status = "okay";
- vdda-supply = <&vreg_l26a_1p2>;
-
- ports {
- port@1 {
- endpoint {
- remote-endpoint = <&sn65dsi86_in_a>;
- data-lanes = <0 1 2 3>;
- };
- };
- };
-};
-
-&dsi0_phy {
- status = "okay";
- vdds-supply = <&vreg_l1a_0p875>;
-};
-
&gcc {
protected-clocks = <GCC_QSPI_CORE_CLK>,
<GCC_QSPI_CORE_CLK_SRC>,
@@ -422,7 +403,7 @@ ports {
port@0 {
reg = <0>;
sn65dsi86_in_a: endpoint {
- remote-endpoint = <&dsi0_out>;
+ remote-endpoint = <&mdss_dsi0_out>;
};
};
@@ -475,6 +456,25 @@ &mdss {
status = "okay";
};
+&mdss_dsi0 {
+ status = "okay";
+ vdda-supply = <&vreg_l26a_1p2>;
+
+ ports {
+ port@1 {
+ endpoint {
+ remote-endpoint = <&sn65dsi86_in_a>;
+ data-lanes = <0 1 2 3>;
+ };
+ };
+ };
+};
+
+&mdss_dsi0_phy {
+ status = "okay";
+ vdds-supply = <&vreg_l1a_0p875>;
+};
+
&mss_pil {
status = "okay";
firmware-name = "qcom/sdm850/LENOVO/81JL/qcdsp1v2850.mbn", "qcom/sdm850/LENOVO/81JL/qcdsp2850.mbn";
diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
index eaac00085894..b841ea9192ae 100644
--- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
@@ -470,75 +470,6 @@ &cdsp {
status = "okay";
};
-&dsi0 {
- vdda-supply = <&vreg_l9a_1p2>;
- qcom,dual-dsi-mode;
- qcom,sync-dual-dsi;
- qcom,master-dsi;
- status = "okay";
-
- display_panel: panel@0 {
- reg = <0>;
- vddio-supply = <&vreg_l14a_1p88>;
- reset-gpios = <&tlmm 75 GPIO_ACTIVE_LOW>;
- backlight = <&backlight>;
-
- status = "disabled";
-
- ports {
- #address-cells = <1>;
- #size-cells = <0>;
-
- port@0 {
- reg = <0>;
-
- panel_in_0: endpoint {
- remote-endpoint = <&dsi0_out>;
- };
- };
-
- port@1{
- reg = <1>;
-
- panel_in_1: endpoint {
- remote-endpoint = <&dsi1_out>;
- };
- };
- };
- };
-};
-
-&dsi0_out {
- data-lanes = <0 1 2>;
- remote-endpoint = <&panel_in_0>;
-};
-
-&dsi0_phy {
- vdds-supply = <&vreg_l5a_0p88>;
- phy-type = <PHY_TYPE_CPHY>;
- status = "okay";
-};
-
-&dsi1 {
- vdda-supply = <&vreg_l9a_1p2>;
- qcom,dual-dsi-mode;
- qcom,sync-dual-dsi;
- /* DSI1 is slave, so use DSI0 clocks */
- assigned-clock-parents = <&dsi0_phy 0>, <&dsi0_phy 1>;
- status = "okay";
-};
-
-&dsi1_out {
- data-lanes = <0 1 2>;
- remote-endpoint = <&panel_in_1>;
-};
-
-&dsi1_phy {
- vdds-supply = <&vreg_l5a_0p88>;
- phy-type = <PHY_TYPE_CPHY>;
- status = "okay";
-};
-
&gmu {
status = "okay";
};
@@ -607,6 +538,75 @@ &mdss {
status = "okay";
};
+&mdss_dsi0 {
+ vdda-supply = <&vreg_l9a_1p2>;
+ qcom,dual-dsi-mode;
+ qcom,sync-dual-dsi;
+ qcom,master-dsi;
+ status = "okay";
+
+ display_panel: panel@0 {
+ reg = <0>;
+ vddio-supply = <&vreg_l14a_1p88>;
+ reset-gpios = <&tlmm 75 GPIO_ACTIVE_LOW>;
+ backlight = <&backlight>;
+
+ status = "disabled";
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+
+ panel_in_0: endpoint {
+ remote-endpoint = <&mdss_dsi0_out>;
+ };
+ };
+
+ port@1{
+ reg = <1>;
+
+ panel_in_1: endpoint {
+ remote-endpoint = <&mdss_dsi1_out>;
+ };
+ };
+ };
+ };
+};
+
+&mdss_dsi0_out {
+ data-lanes = <0 1 2>;
+ remote-endpoint = <&panel_in_0>;
+};
+
+&mdss_dsi0_phy {
+ vdds-supply = <&vreg_l5a_0p88>;
+ phy-type = <PHY_TYPE_CPHY>;
+ status = "okay";
+};
+
+&mdss_dsi1 {
+ vdda-supply = <&vreg_l9a_1p2>;
+ qcom,dual-dsi-mode;
+ qcom,sync-dual-dsi;
+ /* DSI1 is slave, so use DSI0 clocks */
+ assigned-clock-parents = <&mdss_dsi0_phy 0>, <&mdss_dsi0_phy 1>;
+ status = "okay";
+};
+
+&mdss_dsi1_out {
+ data-lanes = <0 1 2>;
+ remote-endpoint = <&panel_in_1>;
+};
+
+&mdss_dsi1_phy {
+ vdds-supply = <&vreg_l5a_0p88>;
+ phy-type = <PHY_TYPE_CPHY>;
+ status = "okay";
+};
+
&pcie0 {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
index e5c60a6e4074..8cfb951f6a67 100644
--- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
@@ -4234,14 +4234,14 @@ ports {
port@0 {
reg = <0>;
dpu_intf1_out: endpoint {
- remote-endpoint = <&dsi0_in>;
+ remote-endpoint = <&mdss_dsi0_in>;
};
};
port@1 {
reg = <1>;
dpu_intf2_out: endpoint {
- remote-endpoint = <&dsi1_in>;
+ remote-endpoint = <&mdss_dsi1_in>;
};
};
};
@@ -4271,7 +4271,7 @@ opp-460000000 {
};
};
- dsi0: dsi@ae94000 {
+ mdss_dsi0: dsi@ae94000 {
compatible = "qcom,sm8250-dsi-ctrl",
"qcom,mdss-dsi-ctrl";
reg = <0 0x0ae94000 0 0x400>;
@@ -4294,12 +4294,12 @@ dsi0: dsi@ae94000 {
"bus";
assigned-clocks = <&dispcc DISP_CC_MDSS_BYTE0_CLK_SRC>, <&dispcc DISP_CC_MDSS_PCLK0_CLK_SRC>;
- assigned-clock-parents = <&dsi0_phy 0>, <&dsi0_phy 1>;
+ assigned-clock-parents = <&mdss_dsi0_phy 0>, <&mdss_dsi0_phy 1>;
operating-points-v2 = <&dsi_opp_table>;
power-domains = <&rpmhpd SM8250_MMCX>;
- phys = <&dsi0_phy>;
+ phys = <&mdss_dsi0_phy>;
status = "disabled";
@@ -4312,14 +4312,14 @@ ports {
port@0 {
reg = <0>;
- dsi0_in: endpoint {
+ mdss_dsi0_in: endpoint {
remote-endpoint = <&dpu_intf1_out>;
};
};
port@1 {
reg = <1>;
- dsi0_out: endpoint {
+ mdss_dsi0_out: endpoint {
};
};
};
@@ -4344,7 +4344,7 @@ opp-358000000 {
};
};
- dsi0_phy: phy@ae94400 {
+ mdss_dsi0_phy: phy@ae94400 {
compatible = "qcom,dsi-phy-7nm";
reg = <0 0x0ae94400 0 0x200>,
<0 0x0ae94600 0 0x280>,
@@ -4363,7 +4363,7 @@ dsi0_phy: phy@ae94400 {
status = "disabled";
};
- dsi1: dsi@ae96000 {
+ mdss_dsi1: dsi@ae96000 {
compatible = "qcom,sm8250-dsi-ctrl",
"qcom,mdss-dsi-ctrl";
reg = <0 0x0ae96000 0 0x400>;
@@ -4386,12 +4386,12 @@ dsi1: dsi@ae96000 {
"bus";
assigned-clocks = <&dispcc DISP_CC_MDSS_BYTE1_CLK_SRC>, <&dispcc DISP_CC_MDSS_PCLK1_CLK_SRC>;
- assigned-clock-parents = <&dsi1_phy 0>, <&dsi1_phy 1>;
+ assigned-clock-parents = <&mdss_dsi1_phy 0>, <&mdss_dsi1_phy 1>;
operating-points-v2 = <&dsi_opp_table>;
power-domains = <&rpmhpd SM8250_MMCX>;
- phys = <&dsi1_phy>;
+ phys = <&mdss_dsi1_phy>;
status = "disabled";
@@ -4404,20 +4404,20 @@ ports {
port@0 {
reg = <0>;
- dsi1_in: endpoint {
+ mdss_dsi1_in: endpoint {
remote-endpoint = <&dpu_intf2_out>;
};
};
port@1 {
reg = <1>;
- dsi1_out: endpoint {
+ mdss_dsi1_out: endpoint {
};
};
};
};
- dsi1_phy: phy@ae96400 {
+ mdss_dsi1_phy: phy@ae96400 {
compatible = "qcom,dsi-phy-7nm";
reg = <0 0x0ae96400 0 0x200>,
<0 0x0ae96600 0 0x280>,
@@ -4443,10 +4443,10 @@ dispcc: clock-controller@af00000 {
power-domains = <&rpmhpd SM8250_MMCX>;
required-opps = <&rpmhpd_opp_low_svs>;
clocks = <&rpmhcc RPMH_CXO_CLK>,
- <&dsi0_phy 0>,
- <&dsi0_phy 1>,
- <&dsi1_phy 0>,
- <&dsi1_phy 1>,
+ <&mdss_dsi0_phy 0>,
+ <&mdss_dsi0_phy 1>,
+ <&mdss_dsi1_phy 0>,
+ <&mdss_dsi1_phy 1>,
<&dp_phy 0>,
<&dp_phy 1>;
clock-names = "bi_tcxo",
--
2.39.2
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 12/14] arm64: dts: qcom: sm8250: rename labels for DSI nodes
2023-05-31 1:16 ` [PATCH 12/14] arm64: dts: qcom: sm8250: " Dmitry Baryshkov
@ 2023-05-31 9:45 ` Konrad Dybcio
0 siblings, 0 replies; 30+ messages in thread
From: Konrad Dybcio @ 2023-05-31 9:45 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree
On 31.05.2023 03:16, Dmitry Baryshkov wrote:
> 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>
> ---
> arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 52 +++----
> .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 40 ++---
> .../dts/qcom/sm8250-xiaomi-elish-common.dtsi | 138 +++++++++---------
> arch/arm64/boot/dts/qcom/sm8250.dtsi | 36 ++---
> 4 files changed, 133 insertions(+), 133 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
> index dfcaac266456..9022ad726741 100644
> --- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
> +++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
> @@ -535,30 +535,6 @@ &cdsp {
> firmware-name = "qcom/sm8250/cdsp.mbn";
> };
>
> -&dsi0 {
> - status = "okay";
> - vdda-supply = <&vreg_l9a_1p2>;
> -
> -#if 0
Uh-oh, could you take care of this in a separate commit?
But since this just moves things:
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> - qcom,dual-dsi-mode;
> - qcom,master-dsi;
> -#endif
> -
> - ports {
> - port@1 {
> - endpoint {
> - remote-endpoint = <<9611_a>;
> - data-lanes = <0 1 2 3>;
> - };
> - };
> - };
> -};
> -
> -&dsi0_phy {
> - status = "okay";
> - vdds-supply = <&vreg_l5a_0p88>;
> -};
> -
> &gmu {
> status = "okay";
> };
> @@ -604,7 +580,7 @@ port@0 {
> reg = <0>;
>
> lt9611_a: endpoint {
> - remote-endpoint = <&dsi0_out>;
> + remote-endpoint = <&mdss_dsi0_out>;
> };
> };
>
> @@ -613,7 +589,7 @@ port@1 {
> reg = <1>;
>
> lt9611_b: endpoint {
> - remote-endpoint = <&dsi1_out>;
> + remote-endpoint = <&mdss_dsi1_out>;
> };
> };
> #endif
> @@ -639,6 +615,30 @@ &mdss {
> status = "okay";
> };
>
> +&mdss_dsi0 {
> + status = "okay";
> + vdda-supply = <&vreg_l9a_1p2>;
> +
> +#if 0
> + qcom,dual-dsi-mode;
> + qcom,master-dsi;
> +#endif
> +
> + ports {
> + port@1 {
> + endpoint {
> + remote-endpoint = <<9611_a>;
> + data-lanes = <0 1 2 3>;
> + };
> + };
> + };
> +};
> +
> +&mdss_dsi0_phy {
> + status = "okay";
> + vdds-supply = <&vreg_l5a_0p88>;
> +};
> +
> &pm8150_adc {
> xo-therm@4c {
> reg = <ADC5_XO_THERM_100K_PU>;
> diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
> index 1326c171fe72..cfbc4fc1eba9 100644
> --- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
> @@ -311,25 +311,6 @@ &cdsp_pas {
> status = "okay";
> };
>
> -&dsi0 {
> - status = "okay";
> - vdda-supply = <&vreg_l26a_1p2>;
> -
> - ports {
> - port@1 {
> - endpoint {
> - remote-endpoint = <&sn65dsi86_in_a>;
> - data-lanes = <0 1 2 3>;
> - };
> - };
> - };
> -};
> -
> -&dsi0_phy {
> - status = "okay";
> - vdds-supply = <&vreg_l1a_0p875>;
> -};
> -
> &gcc {
> protected-clocks = <GCC_QSPI_CORE_CLK>,
> <GCC_QSPI_CORE_CLK_SRC>,
> @@ -422,7 +403,7 @@ ports {
> port@0 {
> reg = <0>;
> sn65dsi86_in_a: endpoint {
> - remote-endpoint = <&dsi0_out>;
> + remote-endpoint = <&mdss_dsi0_out>;
> };
> };
>
> @@ -475,6 +456,25 @@ &mdss {
> status = "okay";
> };
>
> +&mdss_dsi0 {
> + status = "okay";
> + vdda-supply = <&vreg_l26a_1p2>;
> +
> + ports {
> + port@1 {
> + endpoint {
> + remote-endpoint = <&sn65dsi86_in_a>;
> + data-lanes = <0 1 2 3>;
> + };
> + };
> + };
> +};
> +
> +&mdss_dsi0_phy {
> + status = "okay";
> + vdds-supply = <&vreg_l1a_0p875>;
> +};
> +
> &mss_pil {
> status = "okay";
> firmware-name = "qcom/sdm850/LENOVO/81JL/qcdsp1v2850.mbn", "qcom/sdm850/LENOVO/81JL/qcdsp2850.mbn";
> diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
> index eaac00085894..b841ea9192ae 100644
> --- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
> @@ -470,75 +470,6 @@ &cdsp {
> status = "okay";
> };
>
> -&dsi0 {
> - vdda-supply = <&vreg_l9a_1p2>;
> - qcom,dual-dsi-mode;
> - qcom,sync-dual-dsi;
> - qcom,master-dsi;
> - status = "okay";
> -
> - display_panel: panel@0 {
> - reg = <0>;
> - vddio-supply = <&vreg_l14a_1p88>;
> - reset-gpios = <&tlmm 75 GPIO_ACTIVE_LOW>;
> - backlight = <&backlight>;
> -
> - status = "disabled";
> -
> - ports {
> - #address-cells = <1>;
> - #size-cells = <0>;
> -
> - port@0 {
> - reg = <0>;
> -
> - panel_in_0: endpoint {
> - remote-endpoint = <&dsi0_out>;
> - };
> - };
> -
> - port@1{
> - reg = <1>;
> -
> - panel_in_1: endpoint {
> - remote-endpoint = <&dsi1_out>;
> - };
> - };
> - };
> - };
> -};
> -
> -&dsi0_out {
> - data-lanes = <0 1 2>;
> - remote-endpoint = <&panel_in_0>;
> -};
> -
> -&dsi0_phy {
> - vdds-supply = <&vreg_l5a_0p88>;
> - phy-type = <PHY_TYPE_CPHY>;
> - status = "okay";
> -};
> -
> -&dsi1 {
> - vdda-supply = <&vreg_l9a_1p2>;
> - qcom,dual-dsi-mode;
> - qcom,sync-dual-dsi;
> - /* DSI1 is slave, so use DSI0 clocks */
> - assigned-clock-parents = <&dsi0_phy 0>, <&dsi0_phy 1>;
> - status = "okay";
> -};
> -
> -&dsi1_out {
> - data-lanes = <0 1 2>;
> - remote-endpoint = <&panel_in_1>;
> -};
> -
> -&dsi1_phy {
> - vdds-supply = <&vreg_l5a_0p88>;
> - phy-type = <PHY_TYPE_CPHY>;
> - status = "okay";
> -};
> -
> &gmu {
> status = "okay";
> };
> @@ -607,6 +538,75 @@ &mdss {
> status = "okay";
> };
>
> +&mdss_dsi0 {
> + vdda-supply = <&vreg_l9a_1p2>;
> + qcom,dual-dsi-mode;
> + qcom,sync-dual-dsi;
> + qcom,master-dsi;
> + status = "okay";
> +
> + display_panel: panel@0 {
> + reg = <0>;
> + vddio-supply = <&vreg_l14a_1p88>;
> + reset-gpios = <&tlmm 75 GPIO_ACTIVE_LOW>;
> + backlight = <&backlight>;
> +
> + status = "disabled";
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@0 {
> + reg = <0>;
> +
> + panel_in_0: endpoint {
> + remote-endpoint = <&mdss_dsi0_out>;
> + };
> + };
> +
> + port@1{
> + reg = <1>;
> +
> + panel_in_1: endpoint {
> + remote-endpoint = <&mdss_dsi1_out>;
> + };
> + };
> + };
> + };
> +};
> +
> +&mdss_dsi0_out {
> + data-lanes = <0 1 2>;
> + remote-endpoint = <&panel_in_0>;
> +};
> +
> +&mdss_dsi0_phy {
> + vdds-supply = <&vreg_l5a_0p88>;
> + phy-type = <PHY_TYPE_CPHY>;
> + status = "okay";
> +};
> +
> +&mdss_dsi1 {
> + vdda-supply = <&vreg_l9a_1p2>;
> + qcom,dual-dsi-mode;
> + qcom,sync-dual-dsi;
> + /* DSI1 is slave, so use DSI0 clocks */
> + assigned-clock-parents = <&mdss_dsi0_phy 0>, <&mdss_dsi0_phy 1>;
> + status = "okay";
> +};
> +
> +&mdss_dsi1_out {
> + data-lanes = <0 1 2>;
> + remote-endpoint = <&panel_in_1>;
> +};
> +
> +&mdss_dsi1_phy {
> + vdds-supply = <&vreg_l5a_0p88>;
> + phy-type = <PHY_TYPE_CPHY>;
> + status = "okay";
> +};
> +
> &pcie0 {
> status = "okay";
> };
> diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
> index e5c60a6e4074..8cfb951f6a67 100644
> --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
> @@ -4234,14 +4234,14 @@ ports {
> port@0 {
> reg = <0>;
> dpu_intf1_out: endpoint {
> - remote-endpoint = <&dsi0_in>;
> + remote-endpoint = <&mdss_dsi0_in>;
> };
> };
>
> port@1 {
> reg = <1>;
> dpu_intf2_out: endpoint {
> - remote-endpoint = <&dsi1_in>;
> + remote-endpoint = <&mdss_dsi1_in>;
> };
> };
> };
> @@ -4271,7 +4271,7 @@ opp-460000000 {
> };
> };
>
> - dsi0: dsi@ae94000 {
> + mdss_dsi0: dsi@ae94000 {
> compatible = "qcom,sm8250-dsi-ctrl",
> "qcom,mdss-dsi-ctrl";
> reg = <0 0x0ae94000 0 0x400>;
> @@ -4294,12 +4294,12 @@ dsi0: dsi@ae94000 {
> "bus";
>
> assigned-clocks = <&dispcc DISP_CC_MDSS_BYTE0_CLK_SRC>, <&dispcc DISP_CC_MDSS_PCLK0_CLK_SRC>;
> - assigned-clock-parents = <&dsi0_phy 0>, <&dsi0_phy 1>;
> + assigned-clock-parents = <&mdss_dsi0_phy 0>, <&mdss_dsi0_phy 1>;
>
> operating-points-v2 = <&dsi_opp_table>;
> power-domains = <&rpmhpd SM8250_MMCX>;
>
> - phys = <&dsi0_phy>;
> + phys = <&mdss_dsi0_phy>;
>
> status = "disabled";
>
> @@ -4312,14 +4312,14 @@ ports {
>
> port@0 {
> reg = <0>;
> - dsi0_in: endpoint {
> + mdss_dsi0_in: endpoint {
> remote-endpoint = <&dpu_intf1_out>;
> };
> };
>
> port@1 {
> reg = <1>;
> - dsi0_out: endpoint {
> + mdss_dsi0_out: endpoint {
> };
> };
> };
> @@ -4344,7 +4344,7 @@ opp-358000000 {
> };
> };
>
> - dsi0_phy: phy@ae94400 {
> + mdss_dsi0_phy: phy@ae94400 {
> compatible = "qcom,dsi-phy-7nm";
> reg = <0 0x0ae94400 0 0x200>,
> <0 0x0ae94600 0 0x280>,
> @@ -4363,7 +4363,7 @@ dsi0_phy: phy@ae94400 {
> status = "disabled";
> };
>
> - dsi1: dsi@ae96000 {
> + mdss_dsi1: dsi@ae96000 {
> compatible = "qcom,sm8250-dsi-ctrl",
> "qcom,mdss-dsi-ctrl";
> reg = <0 0x0ae96000 0 0x400>;
> @@ -4386,12 +4386,12 @@ dsi1: dsi@ae96000 {
> "bus";
>
> assigned-clocks = <&dispcc DISP_CC_MDSS_BYTE1_CLK_SRC>, <&dispcc DISP_CC_MDSS_PCLK1_CLK_SRC>;
> - assigned-clock-parents = <&dsi1_phy 0>, <&dsi1_phy 1>;
> + assigned-clock-parents = <&mdss_dsi1_phy 0>, <&mdss_dsi1_phy 1>;
>
> operating-points-v2 = <&dsi_opp_table>;
> power-domains = <&rpmhpd SM8250_MMCX>;
>
> - phys = <&dsi1_phy>;
> + phys = <&mdss_dsi1_phy>;
>
> status = "disabled";
>
> @@ -4404,20 +4404,20 @@ ports {
>
> port@0 {
> reg = <0>;
> - dsi1_in: endpoint {
> + mdss_dsi1_in: endpoint {
> remote-endpoint = <&dpu_intf2_out>;
> };
> };
>
> port@1 {
> reg = <1>;
> - dsi1_out: endpoint {
> + mdss_dsi1_out: endpoint {
> };
> };
> };
> };
>
> - dsi1_phy: phy@ae96400 {
> + mdss_dsi1_phy: phy@ae96400 {
> compatible = "qcom,dsi-phy-7nm";
> reg = <0 0x0ae96400 0 0x200>,
> <0 0x0ae96600 0 0x280>,
> @@ -4443,10 +4443,10 @@ dispcc: clock-controller@af00000 {
> power-domains = <&rpmhpd SM8250_MMCX>;
> required-opps = <&rpmhpd_opp_low_svs>;
> clocks = <&rpmhcc RPMH_CXO_CLK>,
> - <&dsi0_phy 0>,
> - <&dsi0_phy 1>,
> - <&dsi1_phy 0>,
> - <&dsi1_phy 1>,
> + <&mdss_dsi0_phy 0>,
> + <&mdss_dsi0_phy 1>,
> + <&mdss_dsi1_phy 0>,
> + <&mdss_dsi1_phy 1>,
> <&dp_phy 0>,
> <&dp_phy 1>;
> clock-names = "bi_tcxo",
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 13/14] arm64: dts: qcom: msm8996: rename labels for HDMI nodes
2023-05-31 1:16 [PATCH 00/14] arm/arm64: dts: qcom: MDSS nodes cleanup Dmitry Baryshkov
` (11 preceding siblings ...)
2023-05-31 1:16 ` [PATCH 12/14] arm64: dts: qcom: sm8250: " Dmitry Baryshkov
@ 2023-05-31 1:16 ` Dmitry Baryshkov
2023-05-31 9:45 ` Konrad Dybcio
2023-05-31 1:16 ` [PATCH 14/14] ARM: dts: qcom: msm8974: rename labels for DSI nodes Dmitry Baryshkov
2023-06-13 23:48 ` (subset) [PATCH 00/14] arm/arm64: dts: qcom: MDSS nodes cleanup Bjorn Andersson
14 siblings, 1 reply; 30+ messages in thread
From: Dmitry Baryshkov @ 2023-05-31 1:16 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree
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 HDMI
node labels from hdmi_* to mdss_hdmi_*.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 50 ++++++++++----------
arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts | 6 +--
arch/arm64/boot/dts/qcom/msm8996-mtp.dts | 4 +-
arch/arm64/boot/dts/qcom/msm8996.dtsi | 16 +++----
4 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
index b599909c4463..537547b97459 100644
--- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
+++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
@@ -208,25 +208,6 @@ &gpu {
status = "okay";
};
-&hdmi {
- status = "okay";
-
- pinctrl-names = "default", "sleep";
- pinctrl-0 = <&hdmi_hpd_active &hdmi_ddc_active>;
- pinctrl-1 = <&hdmi_hpd_suspend &hdmi_ddc_suspend>;
-
- core-vdda-supply = <&vreg_l12a_1p8>;
- core-vcc-supply = <&vreg_s4a_1p8>;
-};
-
-&hdmi_phy {
- status = "okay";
-
- vddio-supply = <&vreg_l12a_1p8>;
- vcca-supply = <&vreg_l28a_0p925>;
- #phy-cells = <0>;
-};
-
&hsusb_phy1 {
status = "okay";
@@ -251,6 +232,25 @@ &mdss {
status = "okay";
};
+&mdss_hdmi {
+ status = "okay";
+
+ pinctrl-names = "default", "sleep";
+ pinctrl-0 = <&mdss_hdmi_hpd_active &mdss_hdmi_ddc_active>;
+ pinctrl-1 = <&mdss_hdmi_hpd_suspend &mdss_hdmi_ddc_suspend>;
+
+ core-vdda-supply = <&vreg_l12a_1p8>;
+ core-vcc-supply = <&vreg_s4a_1p8>;
+};
+
+&mdss_hdmi_phy {
+ status = "okay";
+
+ vddio-supply = <&vreg_l12a_1p8>;
+ vcca-supply = <&vreg_l28a_0p925>;
+ #phy-cells = <0>;
+};
+
&mmcc {
vdd-gfx-supply = <&vdd_gfx>;
};
@@ -433,28 +433,28 @@ sdc2_cd_off: sdc2-cd-off-state {
drive-strength = <2>;
};
- hdmi_hpd_active: hdmi-hpd-active-state {
+ mdss_hdmi_hpd_active: mdss_hdmi-hpd-active-state {
pins = "gpio34";
function = "hdmi_hot";
bias-pull-down;
drive-strength = <16>;
};
- hdmi_hpd_suspend: hdmi-hpd-suspend-state {
+ mdss_hdmi_hpd_suspend: mdss_hdmi-hpd-suspend-state {
pins = "gpio34";
function = "hdmi_hot";
bias-pull-down;
drive-strength = <2>;
};
- hdmi_ddc_active: hdmi-ddc-active-state {
+ mdss_hdmi_ddc_active: mdss_hdmi-ddc-active-state {
pins = "gpio32", "gpio33";
function = "hdmi_ddc";
drive-strength = <2>;
bias-pull-up;
};
- hdmi_ddc_suspend: hdmi-ddc-suspend-state {
+ mdss_hdmi_ddc_suspend: mdss_hdmi-ddc-suspend-state {
pins = "gpio32", "gpio33";
function = "hdmi_ddc";
drive-strength = <2>;
@@ -1043,7 +1043,7 @@ cpu {
};
};
- hdmi-dai-link {
+ mdss_hdmi-dai-link {
link-name = "HDMI";
cpu {
sound-dai = <&q6afedai HDMI_RX>;
@@ -1054,7 +1054,7 @@ platform {
};
codec {
- sound-dai = <&hdmi 0>;
+ sound-dai = <&mdss_hdmi 0>;
};
};
diff --git a/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts b/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
index ed2e2f6c6775..ac6471d1db1f 100644
--- a/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
+++ b/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
@@ -92,15 +92,15 @@ &gpu {
status = "okay";
};
-&hdmi {
+&mdss {
status = "okay";
};
-&hdmi_phy {
+&mdss_hdmi {
status = "okay";
};
-&mdss {
+&mdss_hdmi_phy {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/qcom/msm8996-mtp.dts b/arch/arm64/boot/dts/qcom/msm8996-mtp.dts
index 596ad4c896f5..495d45a16e63 100644
--- a/arch/arm64/boot/dts/qcom/msm8996-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/msm8996-mtp.dts
@@ -24,10 +24,10 @@ &blsp2_uart2 {
status = "okay";
};
-&hdmi {
+&mdss_hdmi {
status = "okay";
};
-&hdmi_phy {
+&mdss_hdmi_phy {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index 3855366ca89f..0cb2d4f08c3a 100644
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -895,7 +895,7 @@ mmcc: clock-controller@8c0000 {
<&mdss_dsi0_phy 0>,
<&mdss_dsi1_phy 1>,
<&mdss_dsi1_phy 0>,
- <&hdmi_phy>;
+ <&mdss_hdmi_phy>;
clock-names = "xo",
"gpll0",
"gcc_mmss_noc_cfg_ahb_clk",
@@ -980,7 +980,7 @@ ports {
port@0 {
reg = <0>;
mdp5_intf3_out: endpoint {
- remote-endpoint = <&hdmi_in>;
+ remote-endpoint = <&mdss_hdmi_in>;
};
};
@@ -1136,8 +1136,8 @@ mdss_dsi1_phy: phy@996400 {
status = "disabled";
};
- hdmi: hdmi-tx@9a0000 {
- compatible = "qcom,hdmi-tx-8996";
+ mdss_hdmi: mdss_hdmi-tx@9a0000 {
+ compatible = "qcom,mdss_hdmi-tx-8996";
reg = <0x009a0000 0x50c>,
<0x00070000 0x6158>,
<0x009e0000 0xfff>;
@@ -1160,7 +1160,7 @@ hdmi: hdmi-tx@9a0000 {
"alt_iface",
"extp";
- phys = <&hdmi_phy>;
+ phys = <&mdss_hdmi_phy>;
#sound-dai-cells = <1>;
status = "disabled";
@@ -1171,16 +1171,16 @@ ports {
port@0 {
reg = <0>;
- hdmi_in: endpoint {
+ mdss_hdmi_in: endpoint {
remote-endpoint = <&mdp5_intf3_out>;
};
};
};
};
- hdmi_phy: phy@9a0600 {
+ mdss_hdmi_phy: phy@9a0600 {
#phy-cells = <0>;
- compatible = "qcom,hdmi-phy-8996";
+ compatible = "qcom,mdss_hdmi-phy-8996";
reg = <0x009a0600 0x1c4>,
<0x009a0a00 0x124>,
<0x009a0c00 0x124>,
--
2.39.2
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 13/14] arm64: dts: qcom: msm8996: rename labels for HDMI nodes
2023-05-31 1:16 ` [PATCH 13/14] arm64: dts: qcom: msm8996: rename labels for HDMI nodes Dmitry Baryshkov
@ 2023-05-31 9:45 ` Konrad Dybcio
0 siblings, 0 replies; 30+ messages in thread
From: Konrad Dybcio @ 2023-05-31 9:45 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree
On 31.05.2023 03:16, Dmitry Baryshkov wrote:
> 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 HDMI
> node labels from hdmi_* to mdss_hdmi_*.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 50 ++++++++++----------
> arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts | 6 +--
> arch/arm64/boot/dts/qcom/msm8996-mtp.dts | 4 +-
> arch/arm64/boot/dts/qcom/msm8996.dtsi | 16 +++----
> 4 files changed, 38 insertions(+), 38 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
> index b599909c4463..537547b97459 100644
> --- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
> +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
> @@ -208,25 +208,6 @@ &gpu {
> status = "okay";
> };
>
> -&hdmi {
> - status = "okay";
> -
> - pinctrl-names = "default", "sleep";
> - pinctrl-0 = <&hdmi_hpd_active &hdmi_ddc_active>;
> - pinctrl-1 = <&hdmi_hpd_suspend &hdmi_ddc_suspend>;
> -
> - core-vdda-supply = <&vreg_l12a_1p8>;
> - core-vcc-supply = <&vreg_s4a_1p8>;
> -};
> -
> -&hdmi_phy {
> - status = "okay";
> -
> - vddio-supply = <&vreg_l12a_1p8>;
> - vcca-supply = <&vreg_l28a_0p925>;
> - #phy-cells = <0>;
> -};
> -
> &hsusb_phy1 {
> status = "okay";
>
> @@ -251,6 +232,25 @@ &mdss {
> status = "okay";
> };
>
> +&mdss_hdmi {
> + status = "okay";
> +
> + pinctrl-names = "default", "sleep";
> + pinctrl-0 = <&mdss_hdmi_hpd_active &mdss_hdmi_ddc_active>;
> + pinctrl-1 = <&mdss_hdmi_hpd_suspend &mdss_hdmi_ddc_suspend>;
> +
> + core-vdda-supply = <&vreg_l12a_1p8>;
> + core-vcc-supply = <&vreg_s4a_1p8>;
> +};
> +
> +&mdss_hdmi_phy {
> + status = "okay";
> +
> + vddio-supply = <&vreg_l12a_1p8>;
> + vcca-supply = <&vreg_l28a_0p925>;
> + #phy-cells = <0>;
> +};
> +
> &mmcc {
> vdd-gfx-supply = <&vdd_gfx>;
> };
> @@ -433,28 +433,28 @@ sdc2_cd_off: sdc2-cd-off-state {
> drive-strength = <2>;
> };
>
> - hdmi_hpd_active: hdmi-hpd-active-state {
> + mdss_hdmi_hpd_active: mdss_hdmi-hpd-active-state {
> pins = "gpio34";
> function = "hdmi_hot";
> bias-pull-down;
> drive-strength = <16>;
> };
>
> - hdmi_hpd_suspend: hdmi-hpd-suspend-state {
> + mdss_hdmi_hpd_suspend: mdss_hdmi-hpd-suspend-state {
> pins = "gpio34";
> function = "hdmi_hot";
> bias-pull-down;
> drive-strength = <2>;
> };
>
> - hdmi_ddc_active: hdmi-ddc-active-state {
> + mdss_hdmi_ddc_active: mdss_hdmi-ddc-active-state {
> pins = "gpio32", "gpio33";
> function = "hdmi_ddc";
> drive-strength = <2>;
> bias-pull-up;
> };
>
> - hdmi_ddc_suspend: hdmi-ddc-suspend-state {
> + mdss_hdmi_ddc_suspend: mdss_hdmi-ddc-suspend-state {
> pins = "gpio32", "gpio33";
> function = "hdmi_ddc";
> drive-strength = <2>;
> @@ -1043,7 +1043,7 @@ cpu {
> };
> };
>
> - hdmi-dai-link {
> + mdss_hdmi-dai-link {
> link-name = "HDMI";
> cpu {
> sound-dai = <&q6afedai HDMI_RX>;
> @@ -1054,7 +1054,7 @@ platform {
> };
>
> codec {
> - sound-dai = <&hdmi 0>;
> + sound-dai = <&mdss_hdmi 0>;
> };
> };
>
> diff --git a/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts b/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
> index ed2e2f6c6775..ac6471d1db1f 100644
> --- a/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
> +++ b/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
> @@ -92,15 +92,15 @@ &gpu {
> status = "okay";
> };
>
> -&hdmi {
> +&mdss {
> status = "okay";
> };
>
> -&hdmi_phy {
> +&mdss_hdmi {
> status = "okay";
> };
>
> -&mdss {
> +&mdss_hdmi_phy {
> status = "okay";
> };
>
> diff --git a/arch/arm64/boot/dts/qcom/msm8996-mtp.dts b/arch/arm64/boot/dts/qcom/msm8996-mtp.dts
> index 596ad4c896f5..495d45a16e63 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996-mtp.dts
> +++ b/arch/arm64/boot/dts/qcom/msm8996-mtp.dts
> @@ -24,10 +24,10 @@ &blsp2_uart2 {
> status = "okay";
> };
>
> -&hdmi {
> +&mdss_hdmi {
> status = "okay";
> };
>
> -&hdmi_phy {
> +&mdss_hdmi_phy {
> status = "okay";
> };
> diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> index 3855366ca89f..0cb2d4f08c3a 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> @@ -895,7 +895,7 @@ mmcc: clock-controller@8c0000 {
> <&mdss_dsi0_phy 0>,
> <&mdss_dsi1_phy 1>,
> <&mdss_dsi1_phy 0>,
> - <&hdmi_phy>;
> + <&mdss_hdmi_phy>;
> clock-names = "xo",
> "gpll0",
> "gcc_mmss_noc_cfg_ahb_clk",
> @@ -980,7 +980,7 @@ ports {
> port@0 {
> reg = <0>;
> mdp5_intf3_out: endpoint {
> - remote-endpoint = <&hdmi_in>;
> + remote-endpoint = <&mdss_hdmi_in>;
> };
> };
>
> @@ -1136,8 +1136,8 @@ mdss_dsi1_phy: phy@996400 {
> status = "disabled";
> };
>
> - hdmi: hdmi-tx@9a0000 {
> - compatible = "qcom,hdmi-tx-8996";
> + mdss_hdmi: mdss_hdmi-tx@9a0000 {
> + compatible = "qcom,mdss_hdmi-tx-8996";
> reg = <0x009a0000 0x50c>,
> <0x00070000 0x6158>,
> <0x009e0000 0xfff>;
> @@ -1160,7 +1160,7 @@ hdmi: hdmi-tx@9a0000 {
> "alt_iface",
> "extp";
>
> - phys = <&hdmi_phy>;
> + phys = <&mdss_hdmi_phy>;
> #sound-dai-cells = <1>;
>
> status = "disabled";
> @@ -1171,16 +1171,16 @@ ports {
>
> port@0 {
> reg = <0>;
> - hdmi_in: endpoint {
> + mdss_hdmi_in: endpoint {
> remote-endpoint = <&mdp5_intf3_out>;
> };
> };
> };
> };
>
> - hdmi_phy: phy@9a0600 {
> + mdss_hdmi_phy: phy@9a0600 {
> #phy-cells = <0>;
> - compatible = "qcom,hdmi-phy-8996";
> + compatible = "qcom,mdss_hdmi-phy-8996";
> reg = <0x009a0600 0x1c4>,
> <0x009a0a00 0x124>,
> <0x009a0c00 0x124>,
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 14/14] ARM: dts: qcom: msm8974: rename labels for DSI nodes
2023-05-31 1:16 [PATCH 00/14] arm/arm64: dts: qcom: MDSS nodes cleanup Dmitry Baryshkov
` (12 preceding siblings ...)
2023-05-31 1:16 ` [PATCH 13/14] arm64: dts: qcom: msm8996: rename labels for HDMI nodes Dmitry Baryshkov
@ 2023-05-31 1:16 ` Dmitry Baryshkov
2023-05-31 9:46 ` Konrad Dybcio
2023-06-13 23:48 ` (subset) [PATCH 00/14] arm/arm64: dts: qcom: MDSS nodes cleanup Bjorn Andersson
14 siblings, 1 reply; 30+ messages in thread
From: Dmitry Baryshkov @ 2023-05-31 1:16 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree
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>
---
.../arm/boot/dts/qcom-apq8074-dragonboard.dts | 24 ++++++-------
.../qcom-msm8974-lge-nexus5-hammerhead.dts | 16 ++++-----
arch/arm/boot/dts/qcom-msm8974.dtsi | 36 +++++++++----------
.../boot/dts/qcom-msm8974pro-samsung-klte.dts | 24 ++++++-------
4 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
index 72f7e09a5bbf..72f6611bbe49 100644
--- a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
+++ b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
@@ -48,7 +48,15 @@ eeprom: eeprom@52 {
};
};
-&dsi0 {
+&gpu {
+ status = "okay";
+};
+
+&mdss {
+ status = "okay";
+};
+
+&mdss_dsi0 {
vdda-supply = <&pm8941_l2>;
vdd-supply = <&pm8941_l22>;
vddio-supply = <&pm8941_l12>;
@@ -65,31 +73,23 @@ 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>;
data-lanes = <0 1 2 3>;
};
-&dsi0_phy {
+&mdss_dsi0_phy {
status = "okay";
vddio-supply = <&pm8941_l12>;
};
-&gpu {
- status = "okay";
-};
-
-&mdss {
- status = "okay";
-};
-
&pm8941_wled {
qcom,cs-out;
qcom,switching-freq = <3200>;
diff --git a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts b/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
index 205907c8670a..60bdfddeae69 100644
--- a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
+++ b/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
@@ -230,7 +230,11 @@ bluetooth {
};
};
-&dsi0 {
+&mdss {
+ status = "okay";
+};
+
+&mdss_dsi0 {
status = "okay";
vdda-supply = <&pm8941_l2>;
@@ -246,27 +250,23 @@ 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>;
data-lanes = <0 1 2 3>;
};
-&dsi0_phy {
+&mdss_dsi0_phy {
status = "okay";
vddio-supply = <&pm8941_l12>;
};
-&mdss {
- status = "okay";
-};
-
&pm8941_gpios {
gpio_keys_pin_a: gpio-keys-active-state {
pins = "gpio2", "gpio3";
diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
index 58e144957c5d..aeca504918a0 100644
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -1837,10 +1837,10 @@ mmcc: clock-controller@fd8c0000 {
<&gcc GPLL0_VOTE>,
<&gcc GPLL1_VOTE>,
<&rpmcc RPM_SMD_GFX3D_CLK_SRC>,
- <&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>,
<0>,
<0>,
<0>;
@@ -1905,20 +1905,20 @@ ports {
port@0 {
reg = <0>;
mdp5_intf1_out: endpoint {
- remote-endpoint = <&dsi0_in>;
+ remote-endpoint = <&mdss_dsi0_in>;
};
};
port@1 {
reg = <1>;
mdp5_intf2_out: endpoint {
- remote-endpoint = <&dsi1_in>;
+ remote-endpoint = <&mdss_dsi1_in>;
};
};
};
};
- dsi0: dsi@fd922800 {
+ mdss_dsi0: dsi@fd922800 {
compatible = "qcom,msm8974-dsi-ctrl",
"qcom,mdss-dsi-ctrl";
reg = <0xfd922800 0x1f8>;
@@ -1928,7 +1928,7 @@ dsi0: dsi@fd922800 {
interrupts = <4>;
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>;
clocks = <&mmcc MDSS_MDP_CLK>,
<&mmcc MDSS_AHB_CLK>,
@@ -1945,7 +1945,7 @@ dsi0: dsi@fd922800 {
"core",
"core_mmss";
- phys = <&dsi0_phy>;
+ phys = <&mdss_dsi0_phy>;
status = "disabled";
@@ -1958,20 +1958,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@fd922a00 {
+ mdss_dsi0_phy: phy@fd922a00 {
compatible = "qcom,dsi-phy-28nm-hpm";
reg = <0xfd922a00 0xd4>,
<0xfd922b00 0x280>,
@@ -1989,7 +1989,7 @@ dsi0_phy: phy@fd922a00 {
status = "disabled";
};
- dsi1: dsi@fd922e00 {
+ mdss_dsi1: dsi@fd922e00 {
compatible = "qcom,msm8974-dsi-ctrl",
"qcom,mdss-dsi-ctrl";
reg = <0xfd922e00 0x1f8>;
@@ -1999,7 +1999,7 @@ dsi1: dsi@fd922e00 {
interrupts = <4>;
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>;
clocks = <&mmcc MDSS_MDP_CLK>,
<&mmcc MDSS_AHB_CLK>,
@@ -2016,7 +2016,7 @@ dsi1: dsi@fd922e00 {
"core",
"core_mmss";
- phys = <&dsi1_phy>;
+ phys = <&mdss_dsi1_phy>;
status = "disabled";
@@ -2029,20 +2029,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@fd923000 {
+ mdss_dsi1_phy: phy@fd923000 {
compatible = "qcom,dsi-phy-28nm-hpm";
reg = <0xfd923000 0xd4>,
<0xfd923100 0x280>,
diff --git a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
index eb505d6d7f31..3e2c86591ee2 100644
--- a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
+++ b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
@@ -329,7 +329,15 @@ bluetooth {
};
};
-&dsi0 {
+&gpu {
+ status = "okay";
+};
+
+&mdss {
+ status = "okay";
+};
+
+&mdss_dsi0 {
status = "okay";
vdda-supply = <&pma8084_l2>;
@@ -351,31 +359,23 @@ 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>;
data-lanes = <0 1 2 3>;
};
-&dsi0_phy {
+&mdss_dsi0_phy {
status = "okay";
vddio-supply = <&pma8084_l12>;
};
-&gpu {
- status = "okay";
-};
-
-&mdss {
- status = "okay";
-};
-
&pma8084_gpios {
gpio_keys_pin_a: gpio-keys-active-state {
pins = "gpio2", "gpio3", "gpio5";
--
2.39.2
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 14/14] ARM: dts: qcom: msm8974: rename labels for DSI nodes
2023-05-31 1:16 ` [PATCH 14/14] ARM: dts: qcom: msm8974: rename labels for DSI nodes Dmitry Baryshkov
@ 2023-05-31 9:46 ` Konrad Dybcio
0 siblings, 0 replies; 30+ messages in thread
From: Konrad Dybcio @ 2023-05-31 9:46 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree
On 31.05.2023 03:16, Dmitry Baryshkov wrote:
> 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>
Konrad
> .../arm/boot/dts/qcom-apq8074-dragonboard.dts | 24 ++++++-------
> .../qcom-msm8974-lge-nexus5-hammerhead.dts | 16 ++++-----
> arch/arm/boot/dts/qcom-msm8974.dtsi | 36 +++++++++----------
> .../boot/dts/qcom-msm8974pro-samsung-klte.dts | 24 ++++++-------
> 4 files changed, 50 insertions(+), 50 deletions(-)
>
> diff --git a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
> index 72f7e09a5bbf..72f6611bbe49 100644
> --- a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
> +++ b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
> @@ -48,7 +48,15 @@ eeprom: eeprom@52 {
> };
> };
>
> -&dsi0 {
> +&gpu {
> + status = "okay";
> +};
> +
> +&mdss {
> + status = "okay";
> +};
> +
> +&mdss_dsi0 {
> vdda-supply = <&pm8941_l2>;
> vdd-supply = <&pm8941_l22>;
> vddio-supply = <&pm8941_l12>;
> @@ -65,31 +73,23 @@ 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>;
> data-lanes = <0 1 2 3>;
> };
>
> -&dsi0_phy {
> +&mdss_dsi0_phy {
> status = "okay";
>
> vddio-supply = <&pm8941_l12>;
> };
>
> -&gpu {
> - status = "okay";
> -};
> -
> -&mdss {
> - status = "okay";
> -};
> -
> &pm8941_wled {
> qcom,cs-out;
> qcom,switching-freq = <3200>;
> diff --git a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts b/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
> index 205907c8670a..60bdfddeae69 100644
> --- a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
> +++ b/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
> @@ -230,7 +230,11 @@ bluetooth {
> };
> };
>
> -&dsi0 {
> +&mdss {
> + status = "okay";
> +};
> +
> +&mdss_dsi0 {
> status = "okay";
>
> vdda-supply = <&pm8941_l2>;
> @@ -246,27 +250,23 @@ 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>;
> data-lanes = <0 1 2 3>;
> };
>
> -&dsi0_phy {
> +&mdss_dsi0_phy {
> status = "okay";
>
> vddio-supply = <&pm8941_l12>;
> };
>
> -&mdss {
> - status = "okay";
> -};
> -
> &pm8941_gpios {
> gpio_keys_pin_a: gpio-keys-active-state {
> pins = "gpio2", "gpio3";
> diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
> index 58e144957c5d..aeca504918a0 100644
> --- a/arch/arm/boot/dts/qcom-msm8974.dtsi
> +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
> @@ -1837,10 +1837,10 @@ mmcc: clock-controller@fd8c0000 {
> <&gcc GPLL0_VOTE>,
> <&gcc GPLL1_VOTE>,
> <&rpmcc RPM_SMD_GFX3D_CLK_SRC>,
> - <&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>,
> <0>,
> <0>,
> <0>;
> @@ -1905,20 +1905,20 @@ ports {
> port@0 {
> reg = <0>;
> mdp5_intf1_out: endpoint {
> - remote-endpoint = <&dsi0_in>;
> + remote-endpoint = <&mdss_dsi0_in>;
> };
> };
>
> port@1 {
> reg = <1>;
> mdp5_intf2_out: endpoint {
> - remote-endpoint = <&dsi1_in>;
> + remote-endpoint = <&mdss_dsi1_in>;
> };
> };
> };
> };
>
> - dsi0: dsi@fd922800 {
> + mdss_dsi0: dsi@fd922800 {
> compatible = "qcom,msm8974-dsi-ctrl",
> "qcom,mdss-dsi-ctrl";
> reg = <0xfd922800 0x1f8>;
> @@ -1928,7 +1928,7 @@ dsi0: dsi@fd922800 {
> interrupts = <4>;
>
> 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>;
>
> clocks = <&mmcc MDSS_MDP_CLK>,
> <&mmcc MDSS_AHB_CLK>,
> @@ -1945,7 +1945,7 @@ dsi0: dsi@fd922800 {
> "core",
> "core_mmss";
>
> - phys = <&dsi0_phy>;
> + phys = <&mdss_dsi0_phy>;
>
> status = "disabled";
>
> @@ -1958,20 +1958,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@fd922a00 {
> + mdss_dsi0_phy: phy@fd922a00 {
> compatible = "qcom,dsi-phy-28nm-hpm";
> reg = <0xfd922a00 0xd4>,
> <0xfd922b00 0x280>,
> @@ -1989,7 +1989,7 @@ dsi0_phy: phy@fd922a00 {
> status = "disabled";
> };
>
> - dsi1: dsi@fd922e00 {
> + mdss_dsi1: dsi@fd922e00 {
> compatible = "qcom,msm8974-dsi-ctrl",
> "qcom,mdss-dsi-ctrl";
> reg = <0xfd922e00 0x1f8>;
> @@ -1999,7 +1999,7 @@ dsi1: dsi@fd922e00 {
> interrupts = <4>;
>
> 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>;
>
> clocks = <&mmcc MDSS_MDP_CLK>,
> <&mmcc MDSS_AHB_CLK>,
> @@ -2016,7 +2016,7 @@ dsi1: dsi@fd922e00 {
> "core",
> "core_mmss";
>
> - phys = <&dsi1_phy>;
> + phys = <&mdss_dsi1_phy>;
>
> status = "disabled";
>
> @@ -2029,20 +2029,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@fd923000 {
> + mdss_dsi1_phy: phy@fd923000 {
> compatible = "qcom,dsi-phy-28nm-hpm";
> reg = <0xfd923000 0xd4>,
> <0xfd923100 0x280>,
> diff --git a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
> index eb505d6d7f31..3e2c86591ee2 100644
> --- a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
> +++ b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
> @@ -329,7 +329,15 @@ bluetooth {
> };
> };
>
> -&dsi0 {
> +&gpu {
> + status = "okay";
> +};
> +
> +&mdss {
> + status = "okay";
> +};
> +
> +&mdss_dsi0 {
> status = "okay";
>
> vdda-supply = <&pma8084_l2>;
> @@ -351,31 +359,23 @@ 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>;
> data-lanes = <0 1 2 3>;
> };
>
> -&dsi0_phy {
> +&mdss_dsi0_phy {
> status = "okay";
>
> vddio-supply = <&pma8084_l12>;
> };
>
> -&gpu {
> - status = "okay";
> -};
> -
> -&mdss {
> - status = "okay";
> -};
> -
> &pma8084_gpios {
> gpio_keys_pin_a: gpio-keys-active-state {
> pins = "gpio2", "gpio3", "gpio5";
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: (subset) [PATCH 00/14] arm/arm64: dts: qcom: MDSS nodes cleanup
2023-05-31 1:16 [PATCH 00/14] arm/arm64: dts: qcom: MDSS nodes cleanup Dmitry Baryshkov
` (13 preceding siblings ...)
2023-05-31 1:16 ` [PATCH 14/14] ARM: dts: qcom: msm8974: rename labels for DSI nodes Dmitry Baryshkov
@ 2023-06-13 23:48 ` Bjorn Andersson
14 siblings, 0 replies; 30+ messages in thread
From: Bjorn Andersson @ 2023-06-13 23:48 UTC (permalink / raw)
To: Krzysztof Kozlowski, Andy Gross, Dmitry Baryshkov, Rob Herring,
Conor Dooley, Konrad Dybcio
Cc: linux-arm-msm, devicetree
On Wed, 31 May 2023 04:16:09 +0300, Dmitry Baryshkov wrote:
> Conclude several ongoing cleanups of display-related nodes for Qualcomm
> platforms:
>
> - Don't disable MDP/DPU node, it is enough to disable MDSS device itself
> - Remove useless mdss_mdp enablements
> - Change labels for DSI and HDMI nodes to start with mdss_ prefix
>
> [...]
Applied, thanks!
[14/14] ARM: dts: qcom: msm8974: rename labels for DSI nodes
commit: d59b294874c7f51317dc7edfc12ff950260ed2b9
Best regards,
--
Bjorn Andersson <andersson@kernel.org>
^ permalink raw reply [flat|nested] 30+ messages in thread