Merge series "Introduce new SOF helpers" from Daniel Baluta <daniel.baluta@oss.nxp...
authorMark Brown <broonie@kernel.org>
Thu, 7 Oct 2021 21:24:58 +0000 (22:24 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 7 Oct 2021 21:24:58 +0000 (22:24 +0100)
Daniel Baluta <daniel.baluta@nxp.com>:

From: Daniel Baluta <daniel.baluta@nxp.com>

This patchseries adds new helpers in order to reduce code duplication
and prepare for compress audio support with SOF.

Bud Liviu-Alexandru (1):
  ASoC: SOF: Make Intel IPC stream ops generic

Daniel Baluta (3):
  ASoC: SOF: Introduce snd_sof_mailbox_read / snd_sof_mailbox_write
    callbacks
  ASoC: SOF: imx: Use newly introduced generic IPC stream ops
  ASoC: SOF: Introduce fragment elapsed notification API

 sound/soc/sof/Kconfig                         |  4 ++
 sound/soc/sof/Makefile                        |  3 +-
 sound/soc/sof/compress.c                      | 51 +++++++++++++++++++
 sound/soc/sof/imx/Kconfig                     |  2 +
 sound/soc/sof/imx/imx8.c                      | 39 +++++++-------
 sound/soc/sof/imx/imx8m.c                     | 26 ++++------
 sound/soc/sof/intel/Makefile                  |  3 --
 sound/soc/sof/intel/apl.c                     |  4 ++
 sound/soc/sof/intel/bdw.c                     | 12 +++--
 sound/soc/sof/intel/byt.c                     | 24 ++++++---
 sound/soc/sof/intel/cnl.c                     |  4 ++
 sound/soc/sof/intel/icl.c                     |  4 ++
 sound/soc/sof/intel/pci-tng.c                 | 12 +++--
 sound/soc/sof/intel/tgl.c                     |  4 ++
 sound/soc/sof/ipc.c                           |  6 ++-
 sound/soc/sof/ops.h                           | 15 ++++++
 sound/soc/sof/pcm.c                           |  7 ++-
 sound/soc/sof/sof-audio.h                     | 11 +++-
 sound/soc/sof/sof-priv.h                      | 28 ++++++----
 .../sof/{intel/intel-ipc.c => stream-ipc.c}   | 50 +++++++++---------
 sound/soc/sof/topology.c                      |  6 ++-
 21 files changed, 218 insertions(+), 97 deletions(-)
 create mode 100644 sound/soc/sof/compress.c
 rename sound/soc/sof/{intel/intel-ipc.c => stream-ipc.c} (58%)

--
2.27.0

1  2 
sound/soc/sof/ipc.c
sound/soc/sof/ops.h
sound/soc/sof/sof-audio.h
sound/soc/sof/sof-priv.h
sound/soc/sof/topology.c

Simple merge
Simple merge
Simple merge
index d9525f3ff5cddb246b1e7b95cf622e3160bd75c2,1a12355d8f414c34831c33d3f638af01c9551c59..efaec2989a27bb7b7f8b5f5629c30ac1c6610cda
@@@ -592,17 -582,26 +600,17 @@@ int sof_block_read(struct snd_sof_dev *
  
  int sof_fw_ready(struct snd_sof_dev *sdev, u32 msg_id);
  
- int intel_ipc_msg_data(struct snd_sof_dev *sdev,
+ int sof_ipc_msg_data(struct snd_sof_dev *sdev,
+                    struct snd_pcm_substream *substream,
+                    void *p, size_t sz);
+ int sof_ipc_pcm_params(struct snd_sof_dev *sdev,
                       struct snd_pcm_substream *substream,
-                      void *p, size_t sz);
- int intel_ipc_pcm_params(struct snd_sof_dev *sdev,
-                        struct snd_pcm_substream *substream,
-                        const struct sof_ipc_pcm_params_reply *reply);
- int intel_pcm_open(struct snd_sof_dev *sdev,
-                  struct snd_pcm_substream *substream);
- int intel_pcm_close(struct snd_sof_dev *sdev,
-                   struct snd_pcm_substream *substream);
+                      const struct sof_ipc_pcm_params_reply *reply);
+ int sof_stream_pcm_open(struct snd_sof_dev *sdev,
+                       struct snd_pcm_substream *substream);
+ int sof_stream_pcm_close(struct snd_sof_dev *sdev,
+                        struct snd_pcm_substream *substream);
  
  int sof_machine_check(struct snd_sof_dev *sdev);
 -
 -#define sof_dev_dbg_or_err(dev, is_err, fmt, ...)                     \
 -      do {                                                            \
 -              if (is_err)                                             \
 -                      dev_err(dev, "error: " fmt, __VA_ARGS__);       \
 -              else                                                    \
 -                      dev_dbg(dev, fmt, __VA_ARGS__);                 \
 -      } while (0)
 -
  #endif
Simple merge