diff options
| author | Mark Brown <broonie@kernel.org> | 2020-05-18 16:43:50 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-05-18 16:43:50 +0100 |
| commit | 4ace9a0ec7293b0b2052da7e39651fb1f4d8eaef (patch) | |
| tree | cc5ed39531f04c418fbc0e930f0bcbdf2f7f2bdf /include | |
| parent | 9bb93a40d95863e2576ccc2b8f05467659c9faf1 (diff) | |
| parent | 99cb681e7b8eec917ddb34b76e303aa20b2d1c1a (diff) | |
| download | linux-4ace9a0ec7293b0b2052da7e39651fb1f4d8eaef.tar.bz2 | |
Merge series "ASoC: SOF: Intel and IMX updates for 5.8" from Kai Vehmanen <kai.vehmanen@linux.intel.com>:
Hi,
here's a series of minor fixes and improvements to SOF. Add support
for smart amplifier component type. Cover more systems by relaxing
match rules for the generic Soundwire machine driver. Fix issues with
driver unload and address a few compiler warnings.
Daniel Baluta (2):
ASoC: SOF: Do nothing when DSP PM callbacks are not set
ASoC: SOF: define INFO_ flags in dsp_ops
Keyon Jie (1):
ASoC: SOF: topology: add support to smart amplifier
Marcin Rajwa (2):
ASoC: SOF: add a power_down_notify method
ASoC: SOF: inform DSP that driver is going to be removed
Pierre-Louis Bossart (2):
ASoC: SOF: imx: make dsp_ops static
ASoC: SOF: imx: make imx8m_dsp_ops static
randerwang (1):
ASoC: SOF: Intel: sdw: relax sdw machine select constraints
include/sound/sof/topology.h | 2 ++
sound/soc/sof/core.c | 6 ++++++
sound/soc/sof/imx/imx8.c | 2 +-
sound/soc/sof/imx/imx8m.c | 8 +++++++-
sound/soc/sof/intel/hda.c | 10 +++++++++-
sound/soc/sof/pm.c | 19 +++++++++++++++++--
sound/soc/sof/sof-priv.h | 1 +
sound/soc/sof/topology.c | 1 +
8 files changed, 44 insertions(+), 5 deletions(-)
--
2.26.0
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/sof/topology.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sound/sof/topology.h b/include/sound/sof/topology.h index 872de52b3144..f56e80d09b32 100644 --- a/include/sound/sof/topology.h +++ b/include/sound/sof/topology.h @@ -38,6 +38,7 @@ enum sof_comp_type { SOF_COMP_DEMUX, SOF_COMP_ASRC, /**< Asynchronous sample rate converter */ SOF_COMP_DCBLOCK, + SOF_COMP_SMART_AMP, /**< smart amplifier component */ /* keep FILEREAD/FILEWRITE as the last ones */ SOF_COMP_FILEREAD = 10000, /**< host test based file IO */ SOF_COMP_FILEWRITE = 10001, /**< host test based file IO */ @@ -220,6 +221,7 @@ enum sof_ipc_process_type { SOF_PROCESS_MUX, SOF_PROCESS_DEMUX, SOF_PROCESS_DCBLOCK, + SOF_PROCESS_SMART_AMP, /**< Smart Amplifier */ }; /* generic "effect", "codec" or proprietary processing component */ |