Merge tag 'rpmsg-v7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc...

Pull rpmsg updates from Bjorn Andersson:
 "Mark 'data' argument in rpmsg_send() const, and perculate to related
  drivers. Replace deprecated class_destroy() with class_unregister()"

* tag 'rpmsg-v7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux:
  media: platform: mtk-mdp3: Constify buffer passed to mdp_vpu_sendmsg()
  ASoC: qcom: Constify GPR packet being send over GPR interface
  rpmsg: Constify buffer passed to send API
  remoteproc: mtk_scp: Constify buffer passed to scp_send_ipi()
  remoteproc: mtk_scp_ipi: Constify buffer passed to scp_ipi_send()
  drivers: rpmsg: class_destroy() is deprecated

diff --cc drivers/remoteproc/mtk_scp.c
Simple merge

diff --cc sound/soc/qcom/qdsp6/audioreach.c
Simple merge

diff --cc sound/soc/qcom/qdsp6/audioreach.h
index 6ddc287f0fb4e429fb8bd899c25df5999ce930d7,6262b9251440c6affa5bce3bcf42bf540bf4d601..6859770b38a6c64de97b2d545370b5ea388e1e2f
--- 1/sound/soc/qcom/qdsp6/audioreach.h
--- 2/sound/soc/qcom/qdsp6/audioreach.h
+++ b/sound/soc/qcom/qdsp6/audioreach.h
@@@ -839,10 -838,14 +839,10 @@@ int audioreach_tplg_init(struct snd_soc
  
  /* Module specific */
  void audioreach_graph_free_buf(struct q6apm_graph *graph);
 -int audioreach_map_memory_regions(struct q6apm_graph *graph,
 -                                unsigned int dir, size_t period_sz,
 -                                unsigned int periods,
 -                                bool is_contiguous);
  int audioreach_send_cmd_sync(struct device *dev, gpr_device_t *gdev, struct gpr_ibasic_rsp_result_t *result,
                             struct mutex *cmd_lock, gpr_port_t *port, wait_queue_head_t *cmd_wait,
-                            struct gpr_pkt *pkt, uint32_t rsp_opcode);
- int audioreach_graph_send_cmd_sync(struct q6apm_graph *graph, struct gpr_pkt *pkt,
+                            const struct gpr_pkt *pkt, uint32_t rsp_opcode);
+ int audioreach_graph_send_cmd_sync(struct q6apm_graph *graph, const struct gpr_pkt *pkt,
                                   uint32_t rsp_opcode);
  int audioreach_set_media_format(struct q6apm_graph *graph,
                                const struct audioreach_module *module,

diff --cc sound/soc/qcom/qdsp6/q6apm.c
Simple merge

diff --cc sound/soc/qcom/qdsp6/q6apm.h
index 909fc337fd2840a42a2af7f91d68cca6d4d6d48d,a39f6046f8868a5169740834b5b9bb8eff9cad96..376a36700c5308d36086520b02d704c5ddce78e1
--- 1/sound/soc/qcom/qdsp6/q6apm.h
--- 2/sound/soc/qcom/qdsp6/q6apm.h
+++ b/sound/soc/qcom/qdsp6/q6apm.h
@@@ -133,16 -132,13 +133,16 @@@ int q6apm_write_async(struct q6apm_grap
                      uint32_t lsw_ts, uint32_t wflags);
  
  /* Memory Map related */
 -int q6apm_map_memory_regions(struct q6apm_graph *graph,
 -                           unsigned int dir, phys_addr_t phys,
 -                           size_t period_sz, unsigned int periods);
 -int q6apm_unmap_memory_regions(struct q6apm_graph *graph,
 -                             unsigned int dir);
 +int q6apm_map_memory_fixed_region(struct device *dev,
 +                           unsigned int graph_id, phys_addr_t phys,
 +                           size_t sz);
 +int q6apm_alloc_fragments(struct q6apm_graph *graph,
 +                      unsigned int dir, phys_addr_t phys,
 +                      size_t period_sz, unsigned int periods);
 +int q6apm_free_fragments(struct q6apm_graph *graph, unsigned int dir);
 +int q6apm_unmap_memory_fixed_region(struct device *dev, unsigned int graph_id);
  /* Helpers */
- int q6apm_send_cmd_sync(struct q6apm *apm, struct gpr_pkt *pkt,
+ int q6apm_send_cmd_sync(struct q6apm *apm, const struct gpr_pkt *pkt,
                        uint32_t rsp_opcode);
  
  /* Callback for graph specific */