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

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

Merge changes Ic2932bb6,I9dab4adf,Ic6d40641,I884bd949 into msm-4.14 

* changes:
  soc: qcom: glink_probe: Add SPSS glink transport
  mailbox: apcs-ipc: Add support for spss on sdm855
  rpmsg: Introduce GLINK SPSS transport
  ARM: dts: msm: Add QSEE IPC IRQ nodes for sdm855
parents 6bfe9fc0 189422c0

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

+2 −2
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ platforms. 
	Definition: must be one of:

		    "qcom,msm8916-apcs-kpss-global",

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

		    "qcom,sdm855-apcs-hmss-global"



		    "qcom,sdm855-apcs-hmss-global",

		    "qcom,sdm855-spcs-global"

- reg:

	Usage: required

	Value type: <prop-encoded-array>

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

+19 −0
Original line number Diff line number Diff line
@@ -2215,6 +2215,25 @@ 
		#mbox-cells = <1>;

	};



	sp_scsr_block: syscon@1880000 {

		compatible = "syscon";

		reg = <0x1880000 0x10000>;

	};



	intsp: qcom,qsee_irq {

		compatible = "qcom,sdm855-qsee-irq";



		syscon = <&sp_scsr_block>;

		interrupts = <0 348 IRQ_TYPE_LEVEL_HIGH>,

			     <0 349 IRQ_TYPE_LEVEL_HIGH>;



		interrupt-names = "sp_ipc0",

				  "sp_ipc1";



		interrupt-controller;

		#interrupt-cells = <3>;

	};



	qcom,glink {

		compatible = "qcom,glink";

		modem {

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

+2 −1
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ static const struct of_device_id qcom_apcs_ipc_of_match[] = { 
	{ .compatible = "qcom,msm8916-apcs-kpss-global", .data = (void *)8 },

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

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

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

	{}

};

MODULE_DEVICE_TABLE(of, qcom_apcs_ipc_of_match);

drivers/rpmsg/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -37,6 +37,19 @@ config RPMSG_QCOM_GLINK_SMEM 
	  which provides support for using the GLINK communication protocol

	  over SMEM.



config RPMSG_QCOM_GLINK_SPSS

	tristate "Qualcomm SPSS Glink driver"

	select RPMSG_QCOM_GLINK_NATIVE

	depends on MAILBOX

	depends on QCOM_SMEM

	select QSEE_IPC_IRQ

	help

	  Say y here to enable support for the GLINK SPSS communication driver,

	  which provides support for using the GLINK communication protocol

	  over SMEM. This protocol maps the smem and then shares the mapped

	  region with the remote proc by writing the smem descriptor location

	  and size into shared registers.



config RPMSG_QCOM_SMD

	tristate "Qualcomm Shared Memory Driver (SMD)"

	depends on QCOM_SMEM

drivers/rpmsg/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -4,5 +4,6 @@ obj-$(CONFIG_RPMSG_CHAR) += rpmsg_char.o 
obj-$(CONFIG_RPMSG_QCOM_GLINK_RPM) += qcom_glink_rpm.o

obj-$(CONFIG_RPMSG_QCOM_GLINK_NATIVE) += qcom_glink_native.o

obj-$(CONFIG_RPMSG_QCOM_GLINK_SMEM) += qcom_glink_smem.o

obj-$(CONFIG_RPMSG_QCOM_GLINK_SPSS) += qcom_glink_spss.o

obj-$(CONFIG_RPMSG_QCOM_SMD)	+= qcom_smd.o

obj-$(CONFIG_RPMSG_VIRTIO)	+= virtio_rpmsg_bus.o