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

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

Merge "ARM: dts: Add MSM QMP nodes for sdxprairie"

parents 229ec356 8fe74fff

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

+2 −1
Original line number Diff line number Diff line
@@ -11,7 +11,8 @@ platforms. 
		    "qcom,msm8916-apcs-kpss-global",

		    "qcom,msm8996-apcs-hmss-global",

		    "qcom,sm8150-apcs-hmss-global",

		    "qcom,sm8150-spcs-global"

		    "qcom,sm8150-spcs-global",

		    "qcom,sdxprairie-apcs-gcc"

- reg:

	Usage: required

	Value type: <prop-encoded-array>

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

+96 −0
Original line number Diff line number Diff line
@@ -272,6 +272,102 @@ 
		qcom,throughput-threshold = <310 600 1000>;

		qcom,scaling-exceptions = <>;

	};



	tcsr_mutex_block: syscon@1f40000 {

		compatible = "syscon";

		reg = <0x1f40000 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>;

	};



	apcs_glb: mailbox@0x17811000 {

		compatible = "qcom,sdxprairie-apcs-gcc";

		reg = <0x17811000 0xb9>;

		#mbox-cells = <1>;

	};



	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 111 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,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-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";

		};

	};



	 qmp_aop: qcom,qmp-aop@c300000 {

		compatible = "qcom,qmp-mbox";

		reg = <0xc310000 0x1000>, <0x17811008 0x4>;

		reg-names = "msgram", "irq-reg-base";

		qcom,irq-mask = <0x1>;

		interrupts = <GIC_SPI 147 IRQ_TYPE_EDGE_RISING>;



		label = "aop";

		qcom,early-boot;

		priority = <0>;

		mbox-desc-offset = <0x0>;

		#mbox-cells = <1>;

	};

};



#include "sdxprairie-pinctrl.dtsi"

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

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

	{ .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 },

	{}

};

MODULE_DEVICE_TABLE(of, qcom_apcs_ipc_of_match);