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

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

Merge changes I67e91522,I2c7661df into msm-next 

* changes:
  dt-bindings: soc: qcom: Extend GLINK to cover SMEM
  rpmsg: glink: Introduce glink smem based transport
parents 63ec9aaf 312d82ad

Documentation/devicetree/bindings/remoteproc/qcom,adsp.txt

+4 −3
Original line number Diff line number Diff line
@@ -63,9 +63,10 @@ on the Qualcomm ADSP Hexagon core. 




= SUBNODES

The adsp node may have an subnode named "smd-edge" that describes the SMD edge,

channels and devices related to the ADSP.  See ../soc/qcom/qcom,smd.txt for

details on how to describe the SMD edge.

The adsp node may have an subnode named either "smd-edge" or "glink-edge" that

describes the communication edge, channels and devices related to the ADSP.

See ../soc/qcom/qcom,smd.txt and ../soc/qcom/qcom,glink.txt for details on how

to describe these.





= EXAMPLE

Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt

+5 −0
Original line number Diff line number Diff line
@@ -90,6 +90,11 @@ the memory regions used by the Hexagon firmware. Each sub-node must contain: 
	Value type: <phandle>

	Definition: reference to the reserved-memory for the region



The Hexagon node may also have an subnode named either "smd-edge" or

"glink-edge" that describes the communication edge, channels and devices

related to the Hexagon.  See ../soc/qcom/qcom,smd.txt and

../soc/qcom/qcom,glink.txt for details on how to describe these.



= EXAMPLE

The following example describes the resources needed to boot control the

Hexagon, as it is found on MSM8974 boards.

Documentation/devicetree/bindings/soc/qcom/qcom,glink.txt

+7 −6
Original line number Diff line number Diff line 
Qualcomm RPM GLINK binding

Qualcomm GLINK edge binding



This binding describes the Qualcomm RPM GLINK, a fifo based mechanism for

communication with the Resource Power Management system on various Qualcomm

platforms.

This binding describes a Qualcomm GLINK edge, a fifo based mechanism for

communication between subsystem-pairs on various Qualcomm platforms. Two types

of edges can be described by the binding; the GLINK RPM edge and a SMEM based

edge.



- compatible:

	Usage: required

	Usage: required for glink-rpm

	Value type: <stringlist>

	Definition: must be "qcom,glink-rpm"
@@ -16,7 +17,7 @@ platforms. 
		    signal this processor about communication related events



- qcom,rpm-msg-ram:

	Usage: required

	Usage: required for glink-rpm

	Value type: <prop-encoded-array>

	Definition: handle to RPM message memory resource

drivers/rpmsg/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -27,6 +27,16 @@ config RPMSG_QCOM_GLINK_RPM 
	  which serves as a channel for communication with the RPM in GLINK

	  enabled systems.



config RPMSG_QCOM_GLINK_SMEM

	tristate "Qualcomm SMEM Glink driver"

	select RPMSG_QCOM_GLINK_NATIVE

	depends on HAS_IOMEM

	depends on MAILBOX

	help

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

	  which provides support for using the GLINK communication protocol

	  over SMEM.



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
@@ -2,5 +2,6 @@ obj-$(CONFIG_RPMSG) += rpmsg_core.o 
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_SMD)	+= qcom_smd.o

obj-$(CONFIG_RPMSG_VIRTIO)	+= virtio_rpmsg_bus.o