arm64: dts: qcom: msm8996: Unify smp2p naming

Rename smp2p-modem to smp2p-mpss, and make the subnode labels of smp2p_adsp
and smp2p_slpi follow the <name>_smp2p_<out/in> layout.
Also move smp2p_slpi_out above smp2p_slpi_in to make it match mpss and adsp
where master-kernel is the first subnode.

This patch brings no functional change.

Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com>
Tested-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> #db820c
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20210926190555.278589-4-y.oudjana@protonmail.com

diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index dd4b2b3702647886583a576c5a8c35e7738140f6..b7b5b17f9dd70f4b8dafaa998c1dcbe335d3567d 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -518,12 +518,12 @@
                qcom,local-pid = <0>;
                qcom,remote-pid = <2>;
 
-               smp2p_adsp_out: master-kernel {
+               adsp_smp2p_out: master-kernel {
                        qcom,entry-name = "master-kernel";
                        #qcom,smem-state-cells = <1>;
                };
 
-               smp2p_adsp_in: slave-kernel {
+               adsp_smp2p_in: slave-kernel {
                        qcom,entry-name = "slave-kernel";
 
                        interrupt-controller;
@@ -531,7 +531,7 @@
                };
        };
 
-       smp2p-modem {
+       smp2p-mpss {
                compatible = "qcom,smp2p";
                qcom,smem = <435>, <428>;
 
@@ -542,12 +542,12 @@
                qcom,local-pid = <0>;
                qcom,remote-pid = <1>;
 
-               modem_smp2p_out: master-kernel {
+               mpss_smp2p_out: master-kernel {
                        qcom,entry-name = "master-kernel";
                        #qcom,smem-state-cells = <1>;
                };
 
-               modem_smp2p_in: slave-kernel {
+               mpss_smp2p_in: slave-kernel {
                        qcom,entry-name = "slave-kernel";
 
                        interrupt-controller;
@@ -566,16 +566,17 @@
                qcom,local-pid = <0>;
                qcom,remote-pid = <3>;
 
-               smp2p_slpi_in: slave-kernel {
+               slpi_smp2p_out: master-kernel {
+                       qcom,entry-name = "master-kernel";
+                       #qcom,smem-state-cells = <1>;
+               };
+
+               slpi_smp2p_in: slave-kernel {
                        qcom,entry-name = "slave-kernel";
+
                        interrupt-controller;
                        #interrupt-cells = <2>;
                };
-
-               smp2p_slpi_out: master-kernel {
-                       qcom,entry-name = "master-kernel";
-                       #qcom,smem-state-cells = <1>;
-               };
        };
 
        soc: soc {
@@ -3029,10 +3030,10 @@
                        reg = <0x09300000 0x80000>;
 
                        interrupts-extended = <&intc 0 162 IRQ_TYPE_EDGE_RISING>,
-                                             <&smp2p_adsp_in 0 IRQ_TYPE_EDGE_RISING>,
-                                             <&smp2p_adsp_in 1 IRQ_TYPE_EDGE_RISING>,
-                                             <&smp2p_adsp_in 2 IRQ_TYPE_EDGE_RISING>,
-                                             <&smp2p_adsp_in 3 IRQ_TYPE_EDGE_RISING>;
+                                             <&adsp_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
+                                             <&adsp_smp2p_in 1 IRQ_TYPE_EDGE_RISING>,
+                                             <&adsp_smp2p_in 2 IRQ_TYPE_EDGE_RISING>,
+                                             <&adsp_smp2p_in 3 IRQ_TYPE_EDGE_RISING>;
                        interrupt-names = "wdog", "fatal", "ready",
                                          "handover", "stop-ack";
 
@@ -3041,7 +3042,7 @@
 
                        memory-region = <&adsp_mem>;
 
-                       qcom,smem-states = <&smp2p_adsp_out 0>;
+                       qcom,smem-states = <&adsp_smp2p_out 0>;
                        qcom,smem-state-names = "stop";
 
                        power-domains = <&rpmpd MSM8996_VDDCX>;