Unverified Commit 27e322fa authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: SOF: define INFO_ flags in dsp_ops 



Currently the INFO_ flags such as PAUSE/NO_PERIOD_WAKEUP are defined
in the SOF PCM core, which doesn't scale. To account for platform
variations, these flags need to be set in DSP ops.

This patch only moves the definitions and does not change any
functionality.

Reviewed-by: default avatarJaska Uimonen <jaska.uimonen@intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191024210318.30068-2-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8c05f6af

sound/soc/sof/imx/imx8.c

+7 −0
Original line number Diff line number Diff line
@@ -388,6 +388,13 @@ struct snd_sof_dsp_ops sof_imx8_ops = { 
	/* DAI drivers */

	.drv = imx8_dai,

	.num_drv = 1, /* we have only 1 ESAI interface on i.MX8 */



	/* ALSA HW info flags */

	.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_imx8_ops);

sound/soc/sof/intel/apl.c

+7 −0
Original line number Diff line number Diff line
@@ -97,6 +97,13 @@ const struct snd_sof_dsp_ops sof_apl_ops = { 
	.runtime_resume		= hda_dsp_runtime_resume,

	.runtime_idle		= hda_dsp_runtime_idle,

	.set_hw_params_upon_resume = hda_dsp_set_hw_params_upon_resume,



	/* ALSA HW info flags */

	.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_apl_ops);

sound/soc/sof/intel/bdw.c

+8 −1
Original line number Diff line number Diff line
@@ -591,7 +591,14 @@ const struct snd_sof_dsp_ops sof_bdw_ops = { 


	/* DAI drivers */

	.drv = bdw_dai,

	.num_drv = ARRAY_SIZE(bdw_dai)

	.num_drv = ARRAY_SIZE(bdw_dai),



	/* ALSA HW info flags */

	.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_bdw_ops);

sound/soc/sof/intel/byt.c

+21 −0
Original line number Diff line number Diff line
@@ -532,6 +532,13 @@ const struct snd_sof_dsp_ops sof_tng_ops = { 
	/* DAI drivers */

	.drv = byt_dai,

	.num_drv = 3, /* we have only 3 SSPs on byt*/



	/* ALSA HW info flags */

	.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_tng_ops);
@@ -693,6 +700,13 @@ const struct snd_sof_dsp_ops sof_byt_ops = { 
	/* DAI drivers */

	.drv = byt_dai,

	.num_drv = 3, /* we have only 3 SSPs on byt*/



	/* ALSA HW info flags */

	.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_byt_ops);
@@ -753,6 +767,13 @@ const struct snd_sof_dsp_ops sof_cht_ops = { 
	.drv = byt_dai,

	/* all 6 SSPs may be available for cherrytrail */

	.num_drv = ARRAY_SIZE(byt_dai),



	/* ALSA HW info flags */

	.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_cht_ops);

sound/soc/sof/intel/cnl.c

+7 −0
Original line number Diff line number Diff line
@@ -255,6 +255,13 @@ const struct snd_sof_dsp_ops sof_cnl_ops = { 
	.runtime_resume		= hda_dsp_runtime_resume,

	.runtime_idle		= hda_dsp_runtime_idle,

	.set_hw_params_upon_resume = hda_dsp_set_hw_params_upon_resume,



	/* ALSA HW info flags */

	.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_cnl_ops);

CRA Git | Maintained and supported by SUSTech CRA and CCSE