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@xxxxxxxxxx>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
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",
