Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e2fcaf2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: move fastrpc rpmsg subnode to glink node for 855" into msm-4.14

parents 5d6f0c53 d8123c4b

Documentation/devicetree/bindings/qdsp/msm-fastrpc.txt

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ Required properties: 
Optional properties:

- qcom,rpc-latency-us:	FastRPC QoS latency vote

- qcom,adsp-remoteheap-vmid:  FastRPC remote heap VMID list

- qcom,secure-context-bank		:	Bool indicating secure FastRPC context bank.



Optional subnodes:

- qcom,msm_fastrpc_compute_cb :	Child nodes representing the compute context

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

+25 −6
Original line number Diff line number Diff line
@@ -2007,12 +2007,6 @@ 
		compatible = "qcom,msm-fastrpc-compute";

		qcom,rpc-latency-us = <611>;



		qcom,msm_fastrpc_rpmsg {

			compatible = "qcom,msm-fastrpc-rpmsg";

			qcom,glink-channels = "fastrpcglink-apps-dsp";

			qcom,intents = <0x64 64>;

		};



		qcom,msm_fastrpc_compute_cb1 {

			compatible = "qcom,msm-fastrpc-compute-cb";

			label = "cdsprpc-smd";
@@ -2096,6 +2090,7 @@ 
		qcom,msm_fastrpc_compute_cb9 {

			compatible = "qcom,msm-fastrpc-compute-cb";

			label = "cdsprpc-smd";

			qcom,secure-context-bank;

			iommus = <&apps_smmu 0x1409 0x40>,

				 <&apps_smmu 0x1429 0x0>,

				 <&apps_smmu 0x2009 0x20>,
@@ -2235,6 +2230,12 @@ 
						0x2000 3

						0x4400 2>;

			};



			qcom,msm_fastrpc_rpmsg {

				compatible = "qcom,msm-fastrpc-rpmsg";

				qcom,glink-channels = "fastrpcglink-apps-dsp";

				qcom,intents = <0x64 64>;

			};

		};



		adsp {
@@ -2255,6 +2256,12 @@ 
				qcom,glink-channels = "apr_audio_svc";

				qcom,intents = <0x200 20>;

			};



			qcom,msm_fastrpc_rpmsg {

				compatible = "qcom,msm-fastrpc-rpmsg";

				qcom,glink-channels = "fastrpcglink-apps-dsp";

				qcom,intents = <0x64 64>;

			};

		};



		dsps {
@@ -2270,6 +2277,12 @@ 
						0x2000 3

						0x4400 2>;

			};



			qcom,msm_fastrpc_rpmsg {

				compatible = "qcom,msm-fastrpc-rpmsg";

				qcom,glink-channels = "fastrpcglink-apps-dsp";

				qcom,intents = <0x64 64>;

			};

		};



		cdsp {
@@ -2285,6 +2298,12 @@ 
						0x2000 3

						0x4400 2>;

			};



			qcom,msm_fastrpc_rpmsg {

				compatible = "qcom,msm-fastrpc-rpmsg";

				qcom,glink-channels = "fastrpcglink-apps-dsp";

				qcom,intents = <0x64 64>;

			};

		};



		glink_spi_xprt_wdsp: wdsp {