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

Commit 521f3970 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'rpmsg-v4.9' of git://github.com/andersson/remoteproc 

Pull rpmsg updates from Bjorn Andersson:
 "The bulk of these patches involve splitting the rpmsg implementation
  into a framework/API part and a virtio specific backend part. It then
  adds the Qualcomm Shared Memory Device (SMD) as an additional
  supported wire format.

  Also included is a set of code style cleanups that have been lingering
  for a while"

* tag 'rpmsg-v4.9' of git://github.com/andersson/remoteproc: (26 commits)
  rpmsg: smd: fix dependency on QCOM_SMD=n
  rpmsg: Introduce Qualcomm SMD backend
  rpmsg: Allow callback to return errors
  rpmsg: Move virtio specifics from public header
  rpmsg: virtio: Hide vrp pointer from the public API
  rpmsg: Hide rpmsg indirection tables
  rpmsg: Split rpmsg core and virtio backend
  rpmsg: Split off generic tail of create_channel()
  rpmsg: Move helper for finding rpmsg devices to core
  rpmsg: Move endpoint related interface to rpmsg core
  rpmsg: Indirection table for rpmsg_endpoint operations
  rpmsg: Move rpmsg_device API to new file
  rpmsg: Introduce indirection table for rpmsg_device operations
  rpmsg: Clean up rpmsg device vs channel naming
  rpmsg: Make rpmsg_create_ept() take channel_info struct
  rpmsg: rpmsg_send() operations takes rpmsg_endpoint
  rpmsg: Name rpmsg devices based on channel id
  rpmsg: Enable matching devices with drivers based on DT
  rpmsg: Drop prototypes for non-existing functions
  samples/rpmsg: add support for multiple instances
  ...
parents d880e5ad 395317bb

drivers/remoteproc/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ config OMAP_REMOTEPROC 
	select REMOTEPROC

	select MAILBOX

	select OMAP2PLUS_MBOX

	select RPMSG

	select RPMSG_VIRTIO

	help

	  Say y here to support OMAP's remote processors (dual M3

	  and DSP on OMAP4) via the remote processor framework.
@@ -59,7 +59,7 @@ config DA8XX_REMOTEPROC 
	depends on ARCH_DAVINCI_DA8XX

	select CMA if MMU

	select REMOTEPROC

	select RPMSG

	select RPMSG_VIRTIO

	help

	  Say y here to support DA8xx/OMAP-L13x remote processors via the

	  remote processor framework.

drivers/rpmsg/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -3,6 +3,20 @@ menu "Rpmsg drivers" 
# RPMSG always gets selected by whoever wants it

config RPMSG

	tristate



config RPMSG_QCOM_SMD

	tristate "Qualcomm Shared Memory Driver (SMD)"

	depends on QCOM_SMEM

	depends on QCOM_SMD=n

	select RPMSG

	help

	  Say y here to enable support for the Qualcomm Shared Memory Driver

	  providing communication channels to remote processors in Qualcomm

	  platforms.



config RPMSG_VIRTIO

	tristate

	select RPMSG

	select VIRTIO

	select VIRTUALIZATION

drivers/rpmsg/Makefile

+3 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_RPMSG)	+= virtio_rpmsg_bus.o
 
obj-$(CONFIG_RPMSG)		+= rpmsg_core.o

obj-$(CONFIG_RPMSG_QCOM_SMD)	+= qcom_smd.o

obj-$(CONFIG_RPMSG_VIRTIO)	+= virtio_rpmsg_bus.o