Unverified Commit 4ace9a0e authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: SOF: Intel and IMX updates for 5.8" from Kai Vehmanen... 

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
parents 9bb93a40 99cb681e

include/sound/sof/topology.h

+2 −0
Original line number Diff line number Diff line
@@ -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 */

sound/soc/sof/core.c

+6 −0
Original line number Diff line number Diff line
@@ -343,6 +343,12 @@ int snd_sof_device_remove(struct device *dev) 
{

	struct snd_sof_dev *sdev = dev_get_drvdata(dev);

	struct snd_sof_pdata *pdata = sdev->pdata;

	int ret;



	ret = snd_sof_dsp_power_down_notify(sdev);

	if (ret < 0)

		dev_warn(dev, "error: %d failed to prepare DSP for device removal",

			 ret);



	if (IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE))

		cancel_work_sync(&sdev->probe_work);

sound/soc/sof/imx/imx8.c

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static void imx8_dsp_handle_request(struct imx_dsp_ipc *ipc) 
	snd_sof_ipc_msgs_rx(priv->sdev);

}



struct imx_dsp_ops dsp_ops = {

static struct imx_dsp_ops dsp_ops = {

	.handle_reply		= imx8_dsp_handle_reply,

	.handle_request		= imx8_dsp_handle_request,

};

sound/soc/sof/imx/imx8m.c

+7 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static void imx8m_dsp_handle_request(struct imx_dsp_ipc *ipc) 
	snd_sof_ipc_msgs_rx(priv->sdev);

}



struct imx_dsp_ops imx8m_dsp_ops = {

static struct imx_dsp_ops imx8m_dsp_ops = {

	.handle_reply		= imx8m_dsp_handle_reply,

	.handle_request		= imx8m_dsp_handle_request,

};
@@ -273,6 +273,12 @@ struct snd_sof_dsp_ops sof_imx8m_ops = { 
	/* DAI drivers */

	.drv = imx8m_dai,

	.num_drv = 1, /* we have only 1 SAI interface on i.MX8M */



	.hw_info = SNDRV_PCM_INFO_MMAP |

		SNDRV_PCM_INFO_MMAP_VALID |

		SNDRV_PCM_INFO_INTERLEAVED |

		SNDRV_PCM_INFO_PAUSE |

		SNDRV_PCM_INFO_NO_PERIOD_WAKEUP,

};

EXPORT_SYMBOL(sof_imx8m_ops);

sound/soc/sof/intel/hda.c

+9 −1
Original line number Diff line number Diff line
@@ -1107,7 +1107,15 @@ static int hda_sdw_machine_select(struct snd_sof_dev *sdev) 
	if (link_mask && !pdata->machine) {

		for (mach = pdata->desc->alt_machines;

		     mach && mach->link_mask; mach++) {

			if (mach->link_mask != link_mask)

			/*

			 * On some platforms such as Up Extreme all links

			 * are enabled but only one link can be used by

			 * external codec. Instead of exact match of two masks,

			 * first check whether link_mask of mach is subset of

			 * link_mask supported by hw and then go on searching

			 * link_adr

			 */

			if (~link_mask & mach->link_mask)

				continue;



			/* No need to match adr if there is no links defined */

CRA Git | Maintained and supported by SUSTech CRA and CCSE