diff options
author | Mark Brown <broonie@kernel.org> | 2019-11-22 19:56:02 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-11-22 19:56:02 +0000 |
commit | 8c4d2a0bfbd27d030e4652b714cd5a1598f3559b (patch) | |
tree | d8ea72d906a690109d2f7aeeb2dc9ec529c0d5a6 /sound/soc/sof/imx | |
parent | 3701d2cb87671c227f1aa59226c9a01e9f01c2ea (diff) | |
parent | 39870b0dec68ed7dd814beb697e541670975c7d8 (diff) | |
download | talos-op-linux-8c4d2a0bfbd27d030e4652b714cd5a1598f3559b.tar.gz talos-op-linux-8c4d2a0bfbd27d030e4652b714cd5a1598f3559b.zip |
Merge branch 'asoc-5.5' into asoc-next
Diffstat (limited to 'sound/soc/sof/imx')
-rw-r--r-- | sound/soc/sof/imx/Kconfig | 8 | ||||
-rw-r--r-- | sound/soc/sof/imx/imx8.c | 7 |
2 files changed, 13 insertions, 2 deletions
diff --git a/sound/soc/sof/imx/Kconfig b/sound/soc/sof/imx/Kconfig index 5acae75f5750..71f318bc2c74 100644 --- a/sound/soc/sof/imx/Kconfig +++ b/sound/soc/sof/imx/Kconfig @@ -11,8 +11,8 @@ config SND_SOC_SOF_IMX_TOPLEVEL if SND_SOC_SOF_IMX_TOPLEVEL -config SND_SOC_SOF_IMX8 - tristate "SOF support for i.MX8" +config SND_SOC_SOF_IMX8_SUPPORT + bool "SOF support for i.MX8" depends on IMX_SCU depends on IMX_DSP help @@ -20,4 +20,8 @@ config SND_SOC_SOF_IMX8 Say Y if you have such a device. If unsure select "N". +config SND_SOC_SOF_IMX8 + def_tristate SND_SOC_SOF_OF + depends on SND_SOC_SOF_IMX8_SUPPORT + endif ## SND_SOC_SOF_IMX_IMX_TOPLEVEL diff --git a/sound/soc/sof/imx/imx8.c b/sound/soc/sof/imx/imx8.c index 2a22b18e5ec0..cfefcfd92798 100644 --- a/sound/soc/sof/imx/imx8.c +++ b/sound/soc/sof/imx/imx8.c @@ -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); |