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
> 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>,
