Commit 6d338feb authored by Yassine Oudjana's avatar Yassine Oudjana Committed by Bjorn Andersson
Browse files

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: default avatarYassine Oudjana <y.oudjana@protonmail.com>
Tested-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> #db820c
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20210926190555.278589-4-y.oudjana@protonmail.com
parent 902d97a4

arch/arm64/boot/dts/qcom/msm8996.dtsi

+17 −16
Original line number Diff line number Diff line
@@ -518,12 +518,12 @@ smp2p-adsp { 
		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_adsp_in: slave-kernel { 
		};

	};



	smp2p-modem {

	smp2p-mpss {

		compatible = "qcom,smp2p";

		qcom,smem = <435>, <428>;
@@ -542,12 +542,12 @@ smp2p-modem { 
		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 @@ smp2p-slpi { 
		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 @@ adsp_pil: remoteproc@9300000 { 
			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 @@ adsp_pil: remoteproc@9300000 { 


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