[TEST] revert rpc/rpmsg changes

4 files changed, 2 insertions, 39 deletions

diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h
index 12bc59a..cd0105d 100644
--- a/include/linux/remoteproc.h
+++ b/include/linux/remoteproc.h
@@ -201,13 +201,6 @@ enum rproc_state {
  *		  POS_SUSPEND event.
  *
  * @RPROC_SECURE: remote processor secure mode has changed.
- *
- * @RPROC_LOAD_ERROR: an error has occurred during loading the remote processor
- *                    binary. users can use this event to release any resources
- *                    acquired after a request to start the processor.
- *
- * @RPROC_PRELOAD: users can register for this event to perform any actions
- *                 before the remoteproc starts loading the binary into memory.
  */
 enum rproc_event {
 	RPROC_ERROR,
@@ -215,8 +208,6 @@ enum rproc_event {
 	RPROC_POS_SUSPEND,
 	RPROC_RESUME,
 	RPROC_SECURE,
-	RPROC_LOAD_ERROR,
-	RPROC_PRELOAD,
 };
 
 #define RPROC_MAX_NAME	100
@@ -277,6 +268,7 @@ struct rproc {
 	int last_trace_len0, last_trace_len1;
 	void *cdump_buf0, *cdump_buf1;
 	int cdump_len0, cdump_len1;
+	struct mutex tlock;
 	struct completion firmware_loading_complete;
 	struct work_struct error_work;
 	struct blocking_notifier_head nbh;
@@ -309,8 +301,6 @@ int rproc_register(struct device *, const char *, const struct rproc_ops *,
 		unsigned int timeout);
 int rproc_unregister(const char *);
 void rproc_last_busy(struct rproc *);
-int rproc_da_to_pa(struct rproc *, u64, phys_addr_t *);
-int rproc_pa_to_da(struct rproc *, phys_addr_t, u64 *);
 #ifdef CONFIG_REMOTE_PROC_AUTOSUSPEND
 extern const struct dev_pm_ops rproc_gen_pm_ops;
 #define GENERIC_RPROC_PM_OPS	(&rproc_gen_pm_ops)
diff --git a/include/linux/rpmsg.h b/include/linux/rpmsg.h
index 1c0e3f9..1f7ba09 100644
--- a/include/linux/rpmsg.h
+++ b/include/linux/rpmsg.h
@@ -72,7 +72,6 @@ enum {
 	VPROC_BUF_SZ,
 	VPROC_SIM_BASE,
 	VPROC_STATIC_CHANNELS,
-	VPROC_RPROC_REF,
 };
 
 #define RPMSG_ADDR_ANY		0xFFFFFFFF
@@ -151,8 +150,6 @@ struct rpmsg_endpoint *rpmsg_create_ept(struct rpmsg_channel *,
 int
 rpmsg_send_offchannel_raw(struct rpmsg_channel *, u32, u32, void *, int, bool);
 
-struct rproc *rpmsg_get_rproc_handle(struct rpmsg_channel *);
-
 static inline
 int rpmsg_send_offchannel(struct rpmsg_channel *rpdev, u32 src, u32 dst,
 							void *data, int len)
diff --git a/include/linux/rpmsg_omx.h b/include/linux/rpmsg_omx.h
index 3d5e42a..15503d5 100644
--- a/include/linux/rpmsg_omx.h
+++ b/include/linux/rpmsg_omx.h
@@ -35,27 +35,13 @@
 
 #include <linux/ioctl.h>
 
-/**
- * struct omx_pvr_data - metadata passed to/from userspace for a pvr register
- * @fd:           a file descriptor representing a pvr handle
- * @num_handles:  field filled by driver. userspace uses this to determine
- *                number of handles associated with fd
- * @handles:      opaque pointers pointing to buffers
- */
-struct omx_pvr_data {
-	int fd;
-	unsigned int num_handles;
-	void *handles[2];
-};
-
 #define OMX_IOC_MAGIC	'X'
 
 #define OMX_IOCCONNECT		_IOW(OMX_IOC_MAGIC, 1, char *)
 #define OMX_IOCIONREGISTER	_IOWR(OMX_IOC_MAGIC, 2, struct ion_fd_data)
 #define OMX_IOCIONUNREGISTER	_IOWR(OMX_IOC_MAGIC, 3, struct ion_fd_data)
-#define OMX_IOCPVRREGISTER	_IOWR(OMX_IOC_MAGIC, 4, struct omx_pvr_data)
 
-#define OMX_IOC_MAXNR	(4)
+#define OMX_IOC_MAXNR	(3)
 
 #ifdef __KERNEL__
 
diff --git a/include/linux/rpmsg_resmgr.h b/include/linux/rpmsg_resmgr.h
index 3d1810e..707809e 100644
--- a/include/linux/rpmsg_resmgr.h
+++ b/include/linux/rpmsg_resmgr.h
@@ -61,7 +61,6 @@ enum {
 	RPRM_DISCONNECT		= 3,
 	RPRM_REQ_CONSTRAINTS	= 4,
 	RPRM_REL_CONSTRAINTS	= 5,
-	RPRM_REQ_DATA		= 6,
 };
 
 enum {
@@ -70,10 +69,6 @@ enum {
 	RPRM_BANDWIDTH		= 0x4,
 };
 
-enum {
-	RPRM_MAX_FREQ		= 0,
-};
-
 struct rprm_request {
 	u32 res_type;
 	u32 acquire;
@@ -133,9 +128,4 @@ struct rprm_constraints_data {
 	long latency;
 };
 
-struct rprm_request_data {
-	u32 type;
-	char data[];
-} __packed;
-
 #endif /* _LINUX_RPMSG_RESMGR_H */