diff options
| author | Shengjiu Wang <shengjiu.wang@nxp.com> | 2019-03-07 11:01:06 +0800 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-11-25 15:53:20 +0800 |
| commit | 26e4c3d80f3ce07dbe5732009b4e6a46ec370966 (patch) | |
| tree | 588fe473a6683085e52b868bf1b0fbc695be1f69 /sound/soc/fsl/Kconfig | |
| parent | b3b38fea22b1a929830ffb5576d1d4a1a53b0b00 (diff) | |
ASoC: fsl_rpmsg: Merge changes from imx_4.19.y
77be7d36a525 ("MLK-22400-1: ASoC: fsl_rpmsg_i2s: Add rpmsg i2s for imx8mn")
31d5dfa44c20 ("MLK-22340-5: ASoC: imx-pcm-rpmsg: enable ignore_suspend for LPA")
c5c41138d5c8 ("MLK-22340-4: ASoC: fsl_rpmsg_i2s: add lock to protect the resource")
adb4b596d2ba ("MLK-22340-3: ASoC: imx-pcm-rpmsg: refine the timer")
a5e80bf012c3 ("MLK-22340-2: ASoC: imx-pcm-rpmsg: drop the cmd I2S_TX_POINTER")
404367d9316b ("MLK-21980: ASoC: imx-pcm-rpmsg: add debugfs_prefix for platform")
971faf095246 ("MLK-21450: ASoC: fsl_rpmsg: fix timer issue for updating to 4.19")
edbbcdc07bf1 ("MLK-21461: ASoC: fsl_rpmsg_i2s: clear buffer pointer in i2s_send_message")
f5f2f38018d8 ("MLK-21447: ASoC: fsl_rpmsg_i2s: underrun in m4 for msg delayed")
d9410ace757f ("MLK-21307: ASoC: fsl_rpmsg_i2s: optimize the message sent to m4")
98633a4cd35b ("MLK-21440-1: ASoC: fsl_rpmsg_i2s: init spin lock")
7bf6d3131863 ("MLK-21107-1: ASoC: Fix timer wake up system after suspend")
eb422681ffa4 ("MLK-20661: ASoC: imx-pcm-rpmsg: remove the nonblock constraint")
e36957e97ca9 ("MLK-21002-1: ASoC: imx-pcm-rpmsg: fix data consumed faster with pause")
bc828e61693f ("MLK-19565-1: ASoC: fsl_rpmsg_i2s: support rpmsg on imx8qm")
e56bedf71ae4 ("MLK-21107-2: ASoC: Drop msg if msg queue is full")
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
(cherry picked from commit 31def064871336af7780d01a6ed8c5ed075b7e48)
Diffstat (limited to 'sound/soc/fsl/Kconfig')
| -rw-r--r-- | sound/soc/fsl/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 00b5db8898d3..1409bd27d7cc 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -76,7 +76,7 @@ config SND_SOC_FSL_MICFIL config SND_SOC_FSL_RPMSG_I2S tristate "I2S base on the RPMSG support" - depends on CONFIG_HAVE_IMX_RPMSG + depends on HAVE_IMX_RPMSG help Say Y if you want to add rpmsg i2s support for the Freescale CPUs. which is depends on the rpmsg. @@ -92,7 +92,7 @@ config SND_SOC_IMX_PCM_DMA config SND_SOC_IMX_PCM_RPMSG tristate - depends on CONFIG_HAVE_IMX_RPMSG + depends on HAVE_IMX_RPMSG select SND_SOC_GENERIC_DMAENGINE_PCM config SND_SOC_IMX_AUDMUX @@ -265,7 +265,7 @@ config SND_SOC_EUKREA_TLV320 config SND_SOC_IMX_RPMSG tristate "SoC Audio support for i.MX boards with rpmsg" - depends on CONFIG_HAVE_IMX_RPMSG + depends on HAVE_IMX_RPMSG select SND_SOC_IMX_PCM_RPMSG select SND_SOC_FSL_RPMSG_I2S select SND_SOC_RPMSG_WM8960 |