From a019e7b4158a88f15b24e90e6d28cc615e558a9e Mon Sep 17 00:00:00 2001 From: Shengjiu Wang Date: Wed, 15 Feb 2017 11:28:36 +0800 Subject: MLK-13904-1: ASoC: fsl: add audio cpu dai driver base on rpmsg (part 1) Add the cpu dai driver, as the rpmsg_send api can't be used in atomic context, so using the workqueue instead of calling rpmsg_send() directly. The detail communication stack is defined in header file. Signed-off-by: Shengjiu Wang Acked-by: Robin Gong [ Aisheng: split out imx-pcm.h changes ] Signed-off-by: Dong Aisheng --- sound/soc/fsl/Kconfig | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'sound/soc/fsl/Kconfig') diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index aa99c008a925..824ec0cc50ff 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -74,6 +74,15 @@ config SND_SOC_FSL_MICFIL Say Y if you want to add Pulse Density Modulation microphone interface (MICFIL) support for NXP. +config SND_SOC_FSL_RPMSG_I2S + tristate "I2S base on the RPMSG support" + depends on RPMSG + help + Say Y if you want to add rpmsg i2s support for the Freescale CPUs. + which is depends on the rpmsg. + This option is only useful for out-of-tree drivers since + in-tree drivers select it automatically. + config SND_SOC_FSL_UTILS tristate -- cgit v1.2.3 From 118fc234d59e4defee4743293af0279e4c44f744 Mon Sep 17 00:00:00 2001 From: Shengjiu Wang Date: Wed, 15 Feb 2017 11:28:26 +0800 Subject: MLK-13904-2: ASoC: fsl: add audio platform driver base on rpmsg Add platform driver, each step like set hw param, trigger start trigger stop, and so on, will call the rpmsg api. Signed-off-by: Shengjiu Wang Acked-by: Robin Gong [Aisheng: clean for a new base ] Signed-off-by: Dong Aisheng --- sound/soc/fsl/Kconfig | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'sound/soc/fsl/Kconfig') diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 824ec0cc50ff..320c6a442af8 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -90,6 +90,11 @@ config SND_SOC_IMX_PCM_DMA tristate select SND_SOC_GENERIC_DMAENGINE_PCM +config SND_SOC_IMX_PCM_RPMSG + tristate + depends on RPMSG + select SND_SOC_GENERIC_DMAENGINE_PCM + config SND_SOC_IMX_AUDMUX tristate "Digital Audio Mux module support" help -- cgit v1.2.3 From 6e155db640433a60c101d41ffb7a5a36780457cf Mon Sep 17 00:00:00 2001 From: Shengjiu Wang Date: Wed, 15 Feb 2017 11:23:45 +0800 Subject: MLK-13904-3: ASoC: fsl: add audio machine driver base on rpmsg Add machine driver, which is using the dummy codec. Signed-off-by: Shengjiu Wang Acked-by: Robin Gong [ Aisheng: clean for a new base ] Signed-off-by: Dong Aisheng --- sound/soc/fsl/Kconfig | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'sound/soc/fsl/Kconfig') diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 320c6a442af8..50713a6ddd11 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -263,6 +263,17 @@ config SND_SOC_EUKREA_TLV320 Enable I2S based access to the TLV320AIC23B codec attached to the SSI interface +config SND_SOC_IMX_RPMSG + tristate "SoC Audio support for i.MX boards with rpmsg" + depends on OF && I2C && INPUT + select SND_SOC_IMX_PCM_RPMSG + select SND_SOC_FSL_RPMSG_I2S + help + SoC Audio support for i.MX boards with rpmsg. + There should be rpmsg devices defined in other core + Say Y if you want to add support for SoC audio on an i.MX board with + a rpmsg devices. + config SND_SOC_IMX_ES8328 tristate "SoC Audio support for i.MX boards with the ES8328 codec" depends on OF && (I2C || SPI) -- cgit v1.2.3 From b9156dc3c1beb7862c4108834e9e0f69918a8cae Mon Sep 17 00:00:00 2001 From: Shengjiu Wang Date: Wed, 7 Mar 2018 11:14:53 +0800 Subject: MLK-17156-7: ASoC: imx-rpmsg: use rpmsg codec instead the dummy use the rpmsg_wm8960 codec instead of the dummy codec Signed-off-by: Shengjiu Wang Reviewed-by: Daniel Baluta --- sound/soc/fsl/Kconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'sound/soc/fsl/Kconfig') diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 50713a6ddd11..744f313c83d7 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -268,6 +268,7 @@ config SND_SOC_IMX_RPMSG depends on OF && I2C && INPUT select SND_SOC_IMX_PCM_RPMSG select SND_SOC_FSL_RPMSG_I2S + select SND_SOC_RPMSG_WM8960 help SoC Audio support for i.MX boards with rpmsg. There should be rpmsg devices defined in other core -- cgit v1.2.3 From 1744cad4ec1d9ca6a0da2fcfa8dbb23d3f43c430 Mon Sep 17 00:00:00 2001 From: Shengjiu Wang Date: Fri, 14 Sep 2018 13:10:05 +0800 Subject: MLK-19581-2: ASoC: imx-rpmsg: support rpmsg_ak4497 For ak4497, the dai fmt should be SND_SOC_DAIFMT_CBS_CFS. Signed-off-by: Shengjiu Wang (cherry picked from commit ecd184c46e2916d2bcdde8db9b2281b89e8b0189) --- sound/soc/fsl/Kconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'sound/soc/fsl/Kconfig') diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 744f313c83d7..39fc56e5c359 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -269,6 +269,7 @@ config SND_SOC_IMX_RPMSG select SND_SOC_IMX_PCM_RPMSG select SND_SOC_FSL_RPMSG_I2S select SND_SOC_RPMSG_WM8960 + select SND_SOC_RPMSG_AK4497 help SoC Audio support for i.MX boards with rpmsg. There should be rpmsg devices defined in other core -- cgit v1.2.3 From 0f97f661f23294002522119c90fcc85cf0757267 Mon Sep 17 00:00:00 2001 From: Shengjiu Wang Date: Wed, 8 Aug 2018 15:05:48 +0800 Subject: MLK-19168-5: ASoC: imx-cs42888: support codec through rpmsg (part 2) support codec through rpmsg Signed-off-by: Shengjiu Wang (cherry picked from commit 8585d67e54c4c3607990a792718992de8be8fe58) [ Aisheng: split card imx-cs42888 changes ] Signed-off-by: Dong Aisheng --- sound/soc/fsl/Kconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'sound/soc/fsl/Kconfig') diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 39fc56e5c359..4d3bd04381e4 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -270,6 +270,7 @@ config SND_SOC_IMX_RPMSG select SND_SOC_FSL_RPMSG_I2S select SND_SOC_RPMSG_WM8960 select SND_SOC_RPMSG_AK4497 + select SND_SOC_RPMSG_CS42XX8 help SoC Audio support for i.MX boards with rpmsg. There should be rpmsg devices defined in other core -- cgit v1.2.3 From 75b021881108ad2e4ae78355086e76ea6b7f4a76 Mon Sep 17 00:00:00 2001 From: Dong Aisheng Date: Mon, 22 Apr 2019 15:35:27 +0800 Subject: ASoC: fsl: fix SND_SOC_FSL_RPMSG_I2S dependency issue IMX RPMSG is still not ready. In file included from ../sound/soc/codecs/rpmsg_wm8960.c:27:0: ../sound/soc/codecs/../fsl/fsl_rpmsg_i2s.h:278:29: fatal error: linux/imx_rpmsg.h: No such file or directory #include ^ compilation terminated. ../scripts/Makefile.build:278: recipe for target 'sound/soc/codecs/rpmsg_wm8960.o' failed make[4]: *** [sound/soc/codecs/rpmsg_wm8960.o] Error 1 make[4]: *** Waiting for unfinished jobs.... AR arch/arm/mach-imx/built-in.a In file included from ../sound/soc/codecs/rpmsg_cs42xx8.c:25:0: ../sound/soc/codecs/../fsl/fsl_rpmsg_i2s.h:278:29: fatal error: linux/imx_rpmsg.h: No such file or directory #include Signed-off-by: Dong Aisheng --- sound/soc/fsl/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sound/soc/fsl/Kconfig') diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 4d3bd04381e4..00b5db8898d3 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 RPMSG + depends on CONFIG_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 RPMSG + depends on CONFIG_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 OF && I2C && INPUT + depends on CONFIG_HAVE_IMX_RPMSG select SND_SOC_IMX_PCM_RPMSG select SND_SOC_FSL_RPMSG_I2S select SND_SOC_RPMSG_WM8960 -- cgit v1.2.3 From 26e4c3d80f3ce07dbe5732009b4e6a46ec370966 Mon Sep 17 00:00:00 2001 From: Shengjiu Wang Date: Thu, 7 Mar 2019 11:01:06 +0800 Subject: 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 (cherry picked from commit 31def064871336af7780d01a6ed8c5ed075b7e48) --- sound/soc/fsl/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sound/soc/fsl/Kconfig') 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 -- cgit v1.2.3