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

Commit f37f5c39 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add MPROC device nodes for trinket"

parents 55c99164 c96f0ad6

Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.txt

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ platforms. 
		    "qcom,sm8150-apcs-hmss-global",

		    "qcom,sm8150-spcs-global",

		    "qcom,sdxprairie-apcs-gcc"

		    "qcom,trinket-apcs-hmss-global"

- reg:

	Usage: required

	Value type: <prop-encoded-array>

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

+297 −0
Original line number Diff line number Diff line
@@ -653,6 +653,303 @@ 
			qcom,dump-id = <0x27>;

		};

	};



	tcsr_mutex_block: syscon@00340000 {

		compatible = "syscon";

		reg = <0x00340000 0x20000>;

	};



	tcsr_mutex: hwlock {

		compatible = "qcom,tcsr-mutex";

		syscon = <&tcsr_mutex_block 0 0x1000>;

		#hwlock-cells = <1>;

	};



	smem: qcom,smem {

		compatible = "qcom,smem";

		memory-region = <&smem_region>;

		hwlocks = <&tcsr_mutex 3>;

	};



	rpm_msg_ram: memory@045F0000 {

			compatible = "qcom,rpm-msg-ram";

			reg = <0x045F0000 0x8000>;

	};



	apcs_glb: mailbox@0F111000 {

		compatible = "qcom,trinket-apcs-hmss-global";

		reg = <0x0F111000 0x1000>;



		#mbox-cells = <1>;

	};



	rpm-glink {

		compatible = "qcom,glink-rpm";

		interrupts = <GIC_SPI 198 IRQ_TYPE_EDGE_RISING>;

		qcom,rpm-msg-ram = <&rpm_msg_ram>;

		mboxes = <&apcs_glb 0>;



		qcom,rpm_glink_ssr {

			qcom,glink-channels = "glink_ssr";

			qcom,notify-edges = <&glink_modem>,

					    <&glink_adsp>,

					    <&glink_cdsp>;

		};



	};



	qcom,glink {

		compatible = "qcom,glink";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		glink_modem: modem {

			qcom,remote-pid = <1>;

			transport = "smem";

			mboxes = <&apcs_glb 12>;

			mbox-names = "mpss_smem";

			interrupts = <GIC_SPI 68 IRQ_TYPE_EDGE_RISING>;



			label = "modem";

			qcom,glink-label = "mpss";



			qcom,modem_qrtr {

				qcom,glink-channels = "IPCRTR";

				qcom,intents = <0x800  5

						0x2000 3

						0x4400 2>;

			};



			qcom,msm_fastrpc_rpmsg {

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

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

				qcom,intents = <0x64 64>;

			};



			qcom,modem_ds {

				qcom,glink-channels = "DS";

				qcom,intents = <0x4000 2>;

			};



			qcom,modem_glink_ssr {

				qcom,glink-channels = "glink_ssr";

				qcom,notify-edges = <&glink_adsp>,

						    <&glink_cdsp>;

			};

		};



		glink_adsp: adsp {

			qcom,remote-pid = <2>;

			transport = "smem";

			mboxes = <&apcs_glb 8>;

			mbox-names = "adsp_smem";

			interrupts = <GIC_SPI 391 IRQ_TYPE_EDGE_RISING>;



			label = "adsp";

			qcom,glink-label = "lpass";



			qcom,adsp_qrtr {

				qcom,glink-channels = "IPCRTR";

				qcom,intents = <0x800  5

						0x2000 3

						0x4400 2>;

			};



			qcom,apr_tal_rpmsg {

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

			};



			qcom,adsp_glink_ssr {

				qcom,glink-channels = "glink_ssr";

				qcom,notify-edges = <&glink_modem>,

						    <&glink_cdsp>;

			};

		};



		glink_cdsp: cdsp {

			qcom,remote-pid = <5>;

			transport = "smem";

			mboxes = <&apcs_glb 28>;

			mbox-names = "cdsp_smem";

			interrupts = <GIC_SPI 261 IRQ_TYPE_EDGE_RISING>;



			label = "cdsp";

			qcom,glink-label = "cdsp";



			qcom,cdsp_qrtr {

				qcom,glink-channels = "IPCRTR";

				qcom,intents = <0x800  5

						0x2000 3

						0x4400 2>;

			};



			qcom,msm_fastrpc_rpmsg {

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

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

				qcom,intents = <0x64 64>;

			};



			qcom,cdsp_glink_ssr {

				qcom,glink-channels = "glink_ssr";

				qcom,notify-edges = <&glink_modem>,

						    <&glink_adsp>;

			};

		};



		glink_spi_xprt_wdsp: wdsp {

			qcom,remote-pid = <10>;

			transport = "spi";

			tx-descriptors = <0x12000 0x12004>;

			rx-descriptors = <0x1200c 0x12010>;



			qcom,wdsp_ctrl {

				qcom,glink-channels = "g_glink_ctrl";

				qcom,intents = <0x400 1>;

			};



			qcom,wdsp_ild {

				qcom,glink-channels =

					"g_glink_persistent_data_ild";

			};



			qcom,wdsp_nild {

				qcom,glink-channels =

					"g_glink_persistent_data_nild";

			};



			qcom,wdsp_data {

				qcom,glink-channels = "g_glink_audio_data";

				qcom,intents = <0x1000 2>;

			};

		};

	};



	qcom,glinkpkt {

		compatible = "qcom,glinkpkt";



		qcom,glinkpkt-at-mdm0 {

			qcom,glinkpkt-edge = "mpss";

			qcom,glinkpkt-ch-name = "DS";

			qcom,glinkpkt-dev-name = "at_mdm0";

		};



		qcom,glinkpkt-apr-apps2 {

			qcom,glinkpkt-edge = "adsp";

			qcom,glinkpkt-ch-name = "apr_apps2";

			qcom,glinkpkt-dev-name = "apr_apps2";

		};



		qcom,glinkpkt-data40-cntl {

			qcom,glinkpkt-edge = "mpss";

			qcom,glinkpkt-ch-name = "DATA40_CNTL";

			qcom,glinkpkt-dev-name = "smdcntl8";

		};



		qcom,glinkpkt-data1 {

			qcom,glinkpkt-edge = "mpss";

			qcom,glinkpkt-ch-name = "DATA1";

			qcom,glinkpkt-dev-name = "smd7";

		};



		qcom,glinkpkt-data4 {

			qcom,glinkpkt-edge = "mpss";

			qcom,glinkpkt-ch-name = "DATA4";

			qcom,glinkpkt-dev-name = "smd8";

		};



		qcom,glinkpkt-data11 {

			qcom,glinkpkt-edge = "mpss";

			qcom,glinkpkt-ch-name = "DATA11";

			qcom,glinkpkt-dev-name = "smd11";

		};

	};



	qcom,smp2p_sleepstate {

		compatible = "qcom,smp2p-sleepstate";

		qcom,smem-states = <&sleepstate_smp2p_out 0>;

		interrupt-parent = <&sleepstate_smp2p_in>;

		interrupts = <0 0>;

		interrupt-names = "smp2p-sleepstate-in";

	};



	qcom,smp2p-modem {

		compatible = "qcom,smp2p";

		qcom,smem = <435>, <428>;

		interrupts = <GIC_SPI 70 IRQ_TYPE_EDGE_RISING>;

		mboxes = <&apcs_glb 14>;

		qcom,local-pid = <0>;

		qcom,remote-pid = <1>;



		modem_smp2p_out: master-kernel {

			qcom,entry-name = "master-kernel";

			#qcom,smem-state-cells = <1>;

		};



		modem_smp2p_in: slave-kernel {

			qcom,entry-name = "slave-kernel";

			interrupt-controller;

			#interrupt-cells = <2>;

		};

	};



	qcom,smp2p-adsp {

		compatible = "qcom,smp2p";

		qcom,smem = <443>, <429>;

		interrupts = <GIC_SPI 393 IRQ_TYPE_EDGE_RISING>;

		mboxes = <&apcs_glb 10>;

		qcom,local-pid = <0>;

		qcom,remote-pid = <2>;



		adsp_smp2p_out: master-kernel {

			qcom,entry-name = "master-kernel";

			#qcom,smem-state-cells = <1>;

		};



		adsp_smp2p_in: slave-kernel {

			qcom,entry-name = "slave-kernel";

			interrupt-controller;

			#interrupt-cells = <2>;

		};



		sleepstate_smp2p_out: sleepstate-out {

			qcom,entry-name = "sleepstate";

			#qcom,smem-state-cells = <1>;

		};



		sleepstate_smp2p_in: qcom,sleepstate-in {

			qcom,entry-name = "sleepstate_see";

			interrupt-controller;

			#interrupt-cells = <2>;

		};

	};



	qcom,smp2p-cdsp {

		compatible = "qcom,smp2p";

		qcom,smem = <94>, <432>;

		interrupts = <GIC_SPI 263 IRQ_TYPE_EDGE_RISING>;

		mboxes = <&apcs_glb 30>;

		qcom,local-pid = <0>;

		qcom,remote-pid = <5>;



		cdsp_smp2p_out: master-kernel {

			qcom,entry-name = "master-kernel";

			#qcom,smem-state-cells = <1>;

		};



		cdsp_smp2p_in: slave-kernel {

			qcom,entry-name = "slave-kernel";

			interrupt-controller;

			#interrupt-cells = <2>;

		};

	};

};

#include "trinket-pinctrl.dtsi"

#include "trinket-ion.dtsi"

drivers/mailbox/qcom-apcs-ipc-mailbox.c

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ static const struct of_device_id qcom_apcs_ipc_of_match[] = { 
	{ .compatible = "qcom,sm8150-apcs-hmss-global", .data = (void *)12 },

	{ .compatible = "qcom,sm8150-spcs-global", .data = (void *)0 },

	{ .compatible = "qcom,sdxprairie-apcs-gcc", .data = (void *)8 },

	{ .compatible = "qcom,trinket-apcs-hmss-global", .data = (void *)8 },

	{}

};

MODULE_DEVICE_TABLE(of, qcom_apcs_ipc_of_match);