| Message ID | 20230531011623.3808538-1-dmitry.baryshkov@linaro.org |
|---|---|
| Headers | show |
| Series | arm/arm64: dts: qcom: MDSS nodes cleanup | expand |
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>;
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>,
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",
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>,
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>,
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,