* [PATCH 1/5] ASoC: fsl: remove use of imx-pcm-audio from fsl_ssi
2013-04-25 3:18 [PATCH 0/5] ASoC: fsl: imx-pcm driver cleanup Shawn Guo
@ 2013-04-25 3:18 ` Shawn Guo
2013-05-15 5:27 ` Mark Brown
2013-04-25 3:18 ` [PATCH 2/5] ASoC: fsl: remove use of imx-pcm-audio from imx-ssi Shawn Guo
` (4 subsequent siblings)
5 siblings, 1 reply; 14+ messages in thread
From: Shawn Guo @ 2013-04-25 3:18 UTC (permalink / raw)
To: Mark Brown; +Cc: Fabio Estevam, alsa-devel, Shawn Guo, kernel
Rather than instantiating imx-pcm-audio to call imx_pcm_dma_init(),
fsl_ssi can just directly call it to save the use of imx-pcm-audio.
With this change, fsl_ssi becomes not only a cpu DAI but also a platform
device, so updates platform device setup in imx-sgtl5000 accordingly.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
sound/soc/fsl/fsl_ssi.c | 13 ++++---------
sound/soc/fsl/imx-sgtl5000.c | 2 +-
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 0f0bed6..2f2d837 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -122,7 +122,6 @@ struct fsl_ssi_private {
bool new_binding;
bool ssi_on_imx;
struct clk *clk;
- struct platform_device *imx_pcm_pdev;
struct snd_dmaengine_dai_dma_data dma_params_tx;
struct snd_dmaengine_dai_dma_data dma_params_rx;
struct imx_dma_data filter_data_tx;
@@ -809,13 +808,9 @@ static int fsl_ssi_probe(struct platform_device *pdev)
}
if (ssi_private->ssi_on_imx) {
- ssi_private->imx_pcm_pdev =
- platform_device_register_simple("imx-pcm-audio",
- -1, NULL, 0);
- if (IS_ERR(ssi_private->imx_pcm_pdev)) {
- ret = PTR_ERR(ssi_private->imx_pcm_pdev);
+ ret = imx_pcm_dma_init(pdev);
+ if (ret)
goto error_dev;
- }
}
/*
@@ -854,7 +849,7 @@ done:
error_dai:
if (ssi_private->ssi_on_imx)
- platform_device_unregister(ssi_private->imx_pcm_pdev);
+ imx_pcm_dma_exit(pdev);
snd_soc_unregister_component(&pdev->dev);
error_dev:
@@ -889,7 +884,7 @@ static int fsl_ssi_remove(struct platform_device *pdev)
if (!ssi_private->new_binding)
platform_device_unregister(ssi_private->pdev);
if (ssi_private->ssi_on_imx) {
- platform_device_unregister(ssi_private->imx_pcm_pdev);
+ imx_pcm_dma_exit(pdev);
clk_disable_unprepare(ssi_private->clk);
clk_put(ssi_private->clk);
}
diff --git a/sound/soc/fsl/imx-sgtl5000.c b/sound/soc/fsl/imx-sgtl5000.c
index 9584e78..8d49165 100644
--- a/sound/soc/fsl/imx-sgtl5000.c
+++ b/sound/soc/fsl/imx-sgtl5000.c
@@ -149,7 +149,7 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
data->dai.codec_dai_name = "sgtl5000";
data->dai.codec_of_node = codec_np;
data->dai.cpu_of_node = ssi_np;
- data->dai.platform_name = "imx-pcm-audio";
+ data->dai.platform_of_node = ssi_np;
data->dai.init = &imx_sgtl5000_dai_init;
data->dai.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBM_CFM;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH 1/5] ASoC: fsl: remove use of imx-pcm-audio from fsl_ssi
2013-04-25 3:18 ` [PATCH 1/5] ASoC: fsl: remove use of imx-pcm-audio from fsl_ssi Shawn Guo
@ 2013-05-15 5:27 ` Mark Brown
0 siblings, 0 replies; 14+ messages in thread
From: Mark Brown @ 2013-05-15 5:27 UTC (permalink / raw)
To: Shawn Guo; +Cc: Fabio Estevam, alsa-devel, kernel
[-- Attachment #1.1: Type: text/plain, Size: 368 bytes --]
On Thu, Apr 25, 2013 at 11:18:46AM +0800, Shawn Guo wrote:
> Rather than instantiating imx-pcm-audio to call imx_pcm_dma_init(),
> fsl_ssi can just directly call it to save the use of imx-pcm-audio.
> With this change, fsl_ssi becomes not only a cpu DAI but also a platform
> device, so updates platform device setup in imx-sgtl5000 accordingly.
Applied all, thanks.
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 2/5] ASoC: fsl: remove use of imx-pcm-audio from imx-ssi
2013-04-25 3:18 [PATCH 0/5] ASoC: fsl: imx-pcm driver cleanup Shawn Guo
2013-04-25 3:18 ` [PATCH 1/5] ASoC: fsl: remove use of imx-pcm-audio from fsl_ssi Shawn Guo
@ 2013-04-25 3:18 ` Shawn Guo
2013-04-25 3:18 ` [PATCH 3/5] ASoC: fsl: create function imx_pcm_fiq_exit() Shawn Guo
` (3 subsequent siblings)
5 siblings, 0 replies; 14+ messages in thread
From: Shawn Guo @ 2013-04-25 3:18 UTC (permalink / raw)
To: Mark Brown; +Cc: Fabio Estevam, alsa-devel, Shawn Guo, kernel
Rather than instantiating imx-pcm-audio to call imx_pcm_dma_init(),
imx-ssi can just directly call it to save the use of imx-pcm-audio.
With this change, imx-ssi becomes not only a cpu DAI but also a
platform device, so updates platform device setup in imx-mc13783 and
mx27vis-aic32x4 accordingly.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
sound/soc/fsl/imx-mc13783.c | 2 +-
sound/soc/fsl/imx-ssi.c | 21 +++++----------------
sound/soc/fsl/imx-ssi.h | 1 -
sound/soc/fsl/mx27vis-aic32x4.c | 2 +-
4 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/sound/soc/fsl/imx-mc13783.c b/sound/soc/fsl/imx-mc13783.c
index 4ae30f2..9df173c 100644
--- a/sound/soc/fsl/imx-mc13783.c
+++ b/sound/soc/fsl/imx-mc13783.c
@@ -64,7 +64,7 @@ static struct snd_soc_dai_link imx_mc13783_dai_mc13783[] = {
.codec_dai_name = "mc13783-hifi",
.codec_name = "mc13783-codec",
.cpu_dai_name = "imx-ssi.0",
- .platform_name = "imx-pcm-audio.0",
+ .platform_name = "imx-ssi.0",
.ops = &imx_mc13783_hifi_ops,
.symmetric_rates = 1,
.dai_fmt = FMT_SSI,
diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c
index 902fab0..b5a2b04 100644
--- a/sound/soc/fsl/imx-ssi.c
+++ b/sound/soc/fsl/imx-ssi.c
@@ -608,24 +608,13 @@ static int imx_ssi_probe(struct platform_device *pdev)
goto failed_pdev_fiq_add;
}
- ssi->soc_platform_pdev = platform_device_alloc("imx-pcm-audio", pdev->id);
- if (!ssi->soc_platform_pdev) {
- ret = -ENOMEM;
- goto failed_pdev_alloc;
- }
-
- platform_set_drvdata(ssi->soc_platform_pdev, ssi);
- ret = platform_device_add(ssi->soc_platform_pdev);
- if (ret) {
- dev_err(&pdev->dev, "failed to add platform device\n");
- goto failed_pdev_add;
- }
+ ret = imx_pcm_dma_init(pdev);
+ if (ret)
+ goto failed_pcm_dma;
return 0;
-failed_pdev_add:
- platform_device_put(ssi->soc_platform_pdev);
-failed_pdev_alloc:
+failed_pcm_dma:
platform_device_del(ssi->soc_platform_pdev_fiq);
failed_pdev_fiq_add:
platform_device_put(ssi->soc_platform_pdev_fiq);
@@ -645,7 +634,7 @@ static int imx_ssi_remove(struct platform_device *pdev)
struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
struct imx_ssi *ssi = platform_get_drvdata(pdev);
- platform_device_unregister(ssi->soc_platform_pdev);
+ imx_pcm_dma_exit(pdev);
platform_device_unregister(ssi->soc_platform_pdev_fiq);
snd_soc_unregister_component(&pdev->dev);
diff --git a/sound/soc/fsl/imx-ssi.h b/sound/soc/fsl/imx-ssi.h
index bb6b3db..b052fad 100644
--- a/sound/soc/fsl/imx-ssi.h
+++ b/sound/soc/fsl/imx-ssi.h
@@ -212,7 +212,6 @@ struct imx_ssi {
int enabled;
- struct platform_device *soc_platform_pdev;
struct platform_device *soc_platform_pdev_fiq;
};
diff --git a/sound/soc/fsl/mx27vis-aic32x4.c b/sound/soc/fsl/mx27vis-aic32x4.c
index 3d10741..f4c3bda 100644
--- a/sound/soc/fsl/mx27vis-aic32x4.c
+++ b/sound/soc/fsl/mx27vis-aic32x4.c
@@ -161,7 +161,7 @@ static struct snd_soc_dai_link mx27vis_aic32x4_dai = {
.name = "tlv320aic32x4",
.stream_name = "TLV320AIC32X4",
.codec_dai_name = "tlv320aic32x4-hifi",
- .platform_name = "imx-pcm-audio.0",
+ .platform_name = "imx-ssi.0",
.codec_name = "tlv320aic32x4.0-0018",
.cpu_dai_name = "imx-ssi.0",
.ops = &mx27vis_aic32x4_snd_ops,
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 3/5] ASoC: fsl: create function imx_pcm_fiq_exit()
2013-04-25 3:18 [PATCH 0/5] ASoC: fsl: imx-pcm driver cleanup Shawn Guo
2013-04-25 3:18 ` [PATCH 1/5] ASoC: fsl: remove use of imx-pcm-audio from fsl_ssi Shawn Guo
2013-04-25 3:18 ` [PATCH 2/5] ASoC: fsl: remove use of imx-pcm-audio from imx-ssi Shawn Guo
@ 2013-04-25 3:18 ` Shawn Guo
2013-04-25 3:18 ` [PATCH 4/5] ASoC: fsl: remove use of imx-fiq-pcm-audio from imx-ssi Shawn Guo
` (2 subsequent siblings)
5 siblings, 0 replies; 14+ messages in thread
From: Shawn Guo @ 2013-04-25 3:18 UTC (permalink / raw)
To: Mark Brown; +Cc: Fabio Estevam, alsa-devel, Shawn Guo, kernel
Create function imx_pcm_fiq_exit() to be paired with imx_pcm_fiq_init()
just like the pair of imx_pcm_dma_init() and imx_pcm_dma_exit().
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
sound/soc/fsl/imx-pcm-fiq.c | 5 +++++
sound/soc/fsl/imx-pcm.c | 2 +-
sound/soc/fsl/imx-pcm.h | 5 +++++
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/sound/soc/fsl/imx-pcm-fiq.c b/sound/soc/fsl/imx-pcm-fiq.c
index 670b96b..710c069 100644
--- a/sound/soc/fsl/imx-pcm-fiq.c
+++ b/sound/soc/fsl/imx-pcm-fiq.c
@@ -314,3 +314,8 @@ failed_register:
return ret;
}
+
+void imx_pcm_fiq_exit(struct platform_device *pdev)
+{
+ snd_soc_unregister_platform(&pdev->dev);
+}
diff --git a/sound/soc/fsl/imx-pcm.c b/sound/soc/fsl/imx-pcm.c
index c498964..16a956b 100644
--- a/sound/soc/fsl/imx-pcm.c
+++ b/sound/soc/fsl/imx-pcm.c
@@ -115,7 +115,7 @@ static int imx_pcm_probe(struct platform_device *pdev)
static int imx_pcm_remove(struct platform_device *pdev)
{
if (strcmp(pdev->id_entry->name, "imx-fiq-pcm-audio") == 0)
- snd_soc_unregister_platform(&pdev->dev);
+ imx_pcm_fiq_exit(pdev);
else
imx_pcm_dma_exit(pdev);
diff --git a/sound/soc/fsl/imx-pcm.h b/sound/soc/fsl/imx-pcm.h
index b7fa0d7..073bf38 100644
--- a/sound/soc/fsl/imx-pcm.h
+++ b/sound/soc/fsl/imx-pcm.h
@@ -53,11 +53,16 @@ static inline void imx_pcm_dma_exit(struct platform_device *pdev)
#ifdef CONFIG_SND_SOC_IMX_PCM_FIQ
int imx_pcm_fiq_init(struct platform_device *pdev);
+void imx_pcm_fiq_exit(struct platform_device *pdev);
#else
static inline int imx_pcm_fiq_init(struct platform_device *pdev)
{
return -ENODEV;
}
+
+static inline void imx_pcm_fiq_exit(struct platform_device *pdev)
+{
+}
#endif
#endif /* _IMX_PCM_H */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 4/5] ASoC: fsl: remove use of imx-fiq-pcm-audio from imx-ssi
2013-04-25 3:18 [PATCH 0/5] ASoC: fsl: imx-pcm driver cleanup Shawn Guo
` (2 preceding siblings ...)
2013-04-25 3:18 ` [PATCH 3/5] ASoC: fsl: create function imx_pcm_fiq_exit() Shawn Guo
@ 2013-04-25 3:18 ` Shawn Guo
2013-04-25 3:18 ` [PATCH 5/5] ASoC: fsl: remove imx-pcm driver Shawn Guo
2013-05-07 8:54 ` [PATCH 0/5] ASoC: fsl: imx-pcm driver cleanup Shawn Guo
5 siblings, 0 replies; 14+ messages in thread
From: Shawn Guo @ 2013-04-25 3:18 UTC (permalink / raw)
To: Mark Brown; +Cc: Fabio Estevam, alsa-devel, Shawn Guo, kernel
Rather than instantiating imx-fiq-pcm-audio to call imx_pcm_fiq_init(),
imx-ssi can just directly call it to save the use of imx-fiq-pcm-audio.
With this change, imx-ssi becomes not only a cpu DAI but also a platform
device, so updates platform device setup in eukrea-tlv320, phycore-ac97
and wm1133-ev1 accordingly.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
sound/soc/fsl/eukrea-tlv320.c | 2 +-
sound/soc/fsl/imx-ssi.c | 23 ++++++-----------------
sound/soc/fsl/imx-ssi.h | 2 --
sound/soc/fsl/phycore-ac97.c | 2 +-
sound/soc/fsl/wm1133-ev1.c | 2 +-
5 files changed, 9 insertions(+), 22 deletions(-)
diff --git a/sound/soc/fsl/eukrea-tlv320.c b/sound/soc/fsl/eukrea-tlv320.c
index 75ffdf0..9a4a0ca 100644
--- a/sound/soc/fsl/eukrea-tlv320.c
+++ b/sound/soc/fsl/eukrea-tlv320.c
@@ -80,7 +80,7 @@ static struct snd_soc_dai_link eukrea_tlv320_dai = {
.name = "tlv320aic23",
.stream_name = "TLV320AIC23",
.codec_dai_name = "tlv320aic23-hifi",
- .platform_name = "imx-fiq-pcm-audio.0",
+ .platform_name = "imx-ssi.0",
.codec_name = "tlv320aic23-codec.0-001a",
.cpu_dai_name = "imx-ssi.0",
.ops = &eukrea_tlv320_snd_ops,
diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c
index b5a2b04..1b2e750 100644
--- a/sound/soc/fsl/imx-ssi.c
+++ b/sound/soc/fsl/imx-ssi.c
@@ -595,18 +595,9 @@ static int imx_ssi_probe(struct platform_device *pdev)
goto failed_register;
}
- ssi->soc_platform_pdev_fiq = platform_device_alloc("imx-fiq-pcm-audio", pdev->id);
- if (!ssi->soc_platform_pdev_fiq) {
- ret = -ENOMEM;
- goto failed_pdev_fiq_alloc;
- }
-
- platform_set_drvdata(ssi->soc_platform_pdev_fiq, ssi);
- ret = platform_device_add(ssi->soc_platform_pdev_fiq);
- if (ret) {
- dev_err(&pdev->dev, "failed to add platform device\n");
- goto failed_pdev_fiq_add;
- }
+ ret = imx_pcm_fiq_init(pdev);
+ if (ret)
+ goto failed_pcm_fiq;
ret = imx_pcm_dma_init(pdev);
if (ret)
@@ -615,10 +606,8 @@ static int imx_ssi_probe(struct platform_device *pdev)
return 0;
failed_pcm_dma:
- platform_device_del(ssi->soc_platform_pdev_fiq);
-failed_pdev_fiq_add:
- platform_device_put(ssi->soc_platform_pdev_fiq);
-failed_pdev_fiq_alloc:
+ imx_pcm_fiq_exit(pdev);
+failed_pcm_fiq:
snd_soc_unregister_component(&pdev->dev);
failed_register:
release_mem_region(res->start, resource_size(res));
@@ -635,7 +624,7 @@ static int imx_ssi_remove(struct platform_device *pdev)
struct imx_ssi *ssi = platform_get_drvdata(pdev);
imx_pcm_dma_exit(pdev);
- platform_device_unregister(ssi->soc_platform_pdev_fiq);
+ imx_pcm_fiq_exit(pdev);
snd_soc_unregister_component(&pdev->dev);
diff --git a/sound/soc/fsl/imx-ssi.h b/sound/soc/fsl/imx-ssi.h
index b052fad..d5003ce 100644
--- a/sound/soc/fsl/imx-ssi.h
+++ b/sound/soc/fsl/imx-ssi.h
@@ -211,8 +211,6 @@ struct imx_ssi {
struct imx_dma_data filter_data_rx;
int enabled;
-
- struct platform_device *soc_platform_pdev_fiq;
};
#endif /* _IMX_SSI_H */
diff --git a/sound/soc/fsl/phycore-ac97.c b/sound/soc/fsl/phycore-ac97.c
index f8da6dd..ae403c2 100644
--- a/sound/soc/fsl/phycore-ac97.c
+++ b/sound/soc/fsl/phycore-ac97.c
@@ -33,7 +33,7 @@ static struct snd_soc_dai_link imx_phycore_dai_ac97[] = {
.codec_dai_name = "wm9712-hifi",
.codec_name = "wm9712-codec",
.cpu_dai_name = "imx-ssi.0",
- .platform_name = "imx-fiq-pcm-audio.0",
+ .platform_name = "imx-ssi.0",
.ops = &imx_phycore_hifi_ops,
},
};
diff --git a/sound/soc/fsl/wm1133-ev1.c b/sound/soc/fsl/wm1133-ev1.c
index fe54a69..fce6325 100644
--- a/sound/soc/fsl/wm1133-ev1.c
+++ b/sound/soc/fsl/wm1133-ev1.c
@@ -245,7 +245,7 @@ static struct snd_soc_dai_link wm1133_ev1_dai = {
.stream_name = "Audio",
.cpu_dai_name = "imx-ssi.0",
.codec_dai_name = "wm8350-hifi",
- .platform_name = "imx-fiq-pcm-audio.0",
+ .platform_name = "imx-ssi.0",
.codec_name = "wm8350-codec.0-0x1a",
.init = wm1133_ev1_init,
.ops = &wm1133_ev1_ops,
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 5/5] ASoC: fsl: remove imx-pcm driver
2013-04-25 3:18 [PATCH 0/5] ASoC: fsl: imx-pcm driver cleanup Shawn Guo
` (3 preceding siblings ...)
2013-04-25 3:18 ` [PATCH 4/5] ASoC: fsl: remove use of imx-fiq-pcm-audio from imx-ssi Shawn Guo
@ 2013-04-25 3:18 ` Shawn Guo
2013-05-07 8:54 ` [PATCH 0/5] ASoC: fsl: imx-pcm driver cleanup Shawn Guo
5 siblings, 0 replies; 14+ messages in thread
From: Shawn Guo @ 2013-04-25 3:18 UTC (permalink / raw)
To: Mark Brown; +Cc: Fabio Estevam, alsa-devel, Shawn Guo, kernel
With imx-pcm-dma moving to generic dmaengine pcm driver and the removal
of imx-pcm-audio/imx-fiq-pcm-audio platform device use, now imx-pcm
driver contains a few functions that are only used by imx-pcm-fiq.c.
Move these functions into imx-pcm-fiq.c and remove imx-pcm.c completely.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
sound/soc/fsl/Kconfig | 5 --
sound/soc/fsl/Makefile | 11 +---
sound/soc/fsl/imx-pcm-dma.c | 2 +
sound/soc/fsl/imx-pcm-fiq.c | 87 ++++++++++++++++++++++++++
sound/soc/fsl/imx-pcm.c | 145 -------------------------------------------
sound/soc/fsl/imx-pcm.h | 5 --
6 files changed, 91 insertions(+), 164 deletions(-)
delete mode 100644 sound/soc/fsl/imx-pcm.c
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 3843a18..7860cc2 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -108,18 +108,13 @@ if SND_IMX_SOC
config SND_SOC_IMX_SSI
tristate
-config SND_SOC_IMX_PCM
- tristate
-
config SND_SOC_IMX_PCM_FIQ
bool
select FIQ
- select SND_SOC_IMX_PCM
config SND_SOC_IMX_PCM_DMA
bool
select SND_SOC_GENERIC_DMAENGINE_PCM
- select SND_SOC_IMX_PCM
config SND_SOC_IMX_AUDMUX
tristate
diff --git a/sound/soc/fsl/Makefile b/sound/soc/fsl/Makefile
index afd3479..91883f8 100644
--- a/sound/soc/fsl/Makefile
+++ b/sound/soc/fsl/Makefile
@@ -30,18 +30,11 @@ obj-$(CONFIG_SND_MPC52xx_SOC_EFIKA) += efika-audio-fabric.o
# i.MX Platform Support
snd-soc-imx-ssi-objs := imx-ssi.o
snd-soc-imx-audmux-objs := imx-audmux.o
-snd-soc-imx-pcm-objs := imx-pcm.o
-ifneq ($(CONFIG_SND_SOC_IMX_PCM_FIQ),)
- snd-soc-imx-pcm-objs += imx-pcm-fiq.o
-endif
-ifneq ($(CONFIG_SND_SOC_IMX_PCM_DMA),)
- snd-soc-imx-pcm-objs += imx-pcm-dma.o
-endif
-
obj-$(CONFIG_SND_SOC_IMX_SSI) += snd-soc-imx-ssi.o
obj-$(CONFIG_SND_SOC_IMX_AUDMUX) += snd-soc-imx-audmux.o
-obj-$(CONFIG_SND_SOC_IMX_PCM) += snd-soc-imx-pcm.o
+obj-$(CONFIG_SND_SOC_IMX_PCM_FIQ) += imx-pcm-fiq.o
+obj-$(CONFIG_SND_SOC_IMX_PCM_DMA) += imx-pcm-dma.o
# i.MX Machine Support
snd-soc-eukrea-tlv320-objs := eukrea-tlv320.o
diff --git a/sound/soc/fsl/imx-pcm-dma.c b/sound/soc/fsl/imx-pcm-dma.c
index c246fb5..fde4d2e 100644
--- a/sound/soc/fsl/imx-pcm-dma.c
+++ b/sound/soc/fsl/imx-pcm-dma.c
@@ -67,8 +67,10 @@ int imx_pcm_dma_init(struct platform_device *pdev)
SND_DMAENGINE_PCM_FLAG_NO_DT |
SND_DMAENGINE_PCM_FLAG_COMPAT);
}
+EXPORT_SYMBOL_GPL(imx_pcm_dma_init);
void imx_pcm_dma_exit(struct platform_device *pdev)
{
snd_dmaengine_pcm_unregister(&pdev->dev);
}
+EXPORT_SYMBOL_GPL(imx_pcm_dma_exit);
diff --git a/sound/soc/fsl/imx-pcm-fiq.c b/sound/soc/fsl/imx-pcm-fiq.c
index 710c069..310d902 100644
--- a/sound/soc/fsl/imx-pcm-fiq.c
+++ b/sound/soc/fsl/imx-pcm-fiq.c
@@ -225,6 +225,22 @@ static int snd_imx_close(struct snd_pcm_substream *substream)
return 0;
}
+static int snd_imx_pcm_mmap(struct snd_pcm_substream *substream,
+ struct vm_area_struct *vma)
+{
+ struct snd_pcm_runtime *runtime = substream->runtime;
+ int ret;
+
+ ret = dma_mmap_writecombine(substream->pcm->card->dev, vma,
+ runtime->dma_area, runtime->dma_addr, runtime->dma_bytes);
+
+ pr_debug("%s: ret: %d %p 0x%08x 0x%08x\n", __func__, ret,
+ runtime->dma_area,
+ runtime->dma_addr,
+ runtime->dma_bytes);
+ return ret;
+}
+
static struct snd_pcm_ops imx_pcm_ops = {
.open = snd_imx_open,
.close = snd_imx_close,
@@ -236,6 +252,54 @@ static struct snd_pcm_ops imx_pcm_ops = {
.mmap = snd_imx_pcm_mmap,
};
+static int imx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream)
+{
+ struct snd_pcm_substream *substream = pcm->streams[stream].substream;
+ struct snd_dma_buffer *buf = &substream->dma_buffer;
+ size_t size = IMX_SSI_DMABUF_SIZE;
+
+ buf->dev.type = SNDRV_DMA_TYPE_DEV;
+ buf->dev.dev = pcm->card->dev;
+ buf->private_data = NULL;
+ buf->area = dma_alloc_writecombine(pcm->card->dev, size,
+ &buf->addr, GFP_KERNEL);
+ if (!buf->area)
+ return -ENOMEM;
+ buf->bytes = size;
+
+ return 0;
+}
+
+static u64 imx_pcm_dmamask = DMA_BIT_MASK(32);
+
+static int imx_pcm_new(struct snd_soc_pcm_runtime *rtd)
+{
+ struct snd_card *card = rtd->card->snd_card;
+ struct snd_pcm *pcm = rtd->pcm;
+ int ret = 0;
+
+ if (!card->dev->dma_mask)
+ card->dev->dma_mask = &imx_pcm_dmamask;
+ if (!card->dev->coherent_dma_mask)
+ card->dev->coherent_dma_mask = DMA_BIT_MASK(32);
+ if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
+ ret = imx_pcm_preallocate_dma_buffer(pcm,
+ SNDRV_PCM_STREAM_PLAYBACK);
+ if (ret)
+ goto out;
+ }
+
+ if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
+ ret = imx_pcm_preallocate_dma_buffer(pcm,
+ SNDRV_PCM_STREAM_CAPTURE);
+ if (ret)
+ goto out;
+ }
+
+out:
+ return ret;
+}
+
static int ssi_irq = 0;
static int imx_pcm_fiq_new(struct snd_soc_pcm_runtime *rtd)
@@ -268,6 +332,27 @@ static int imx_pcm_fiq_new(struct snd_soc_pcm_runtime *rtd)
return 0;
}
+static void imx_pcm_free(struct snd_pcm *pcm)
+{
+ struct snd_pcm_substream *substream;
+ struct snd_dma_buffer *buf;
+ int stream;
+
+ for (stream = 0; stream < 2; stream++) {
+ substream = pcm->streams[stream].substream;
+ if (!substream)
+ continue;
+
+ buf = &substream->dma_buffer;
+ if (!buf->area)
+ continue;
+
+ dma_free_writecombine(pcm->card->dev, buf->bytes,
+ buf->area, buf->addr);
+ buf->area = NULL;
+ }
+}
+
static void imx_pcm_fiq_free(struct snd_pcm *pcm)
{
mxc_set_irq_fiq(ssi_irq, 0);
@@ -314,8 +399,10 @@ failed_register:
return ret;
}
+EXPORT_SYMBOL_GPL(imx_pcm_fiq_init);
void imx_pcm_fiq_exit(struct platform_device *pdev)
{
snd_soc_unregister_platform(&pdev->dev);
}
+EXPORT_SYMBOL_GPL(imx_pcm_fiq_exit);
diff --git a/sound/soc/fsl/imx-pcm.c b/sound/soc/fsl/imx-pcm.c
deleted file mode 100644
index 16a956b..0000000
--- a/sound/soc/fsl/imx-pcm.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright 2009 Sascha Hauer <s.hauer@pengutronix.de>
- *
- * This code is based on code copyrighted by Freescale,
- * Liam Girdwood, Javier Martin and probably others.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- */
-
-#include <linux/dma-mapping.h>
-#include <linux/module.h>
-#include <sound/pcm.h>
-#include <sound/soc.h>
-#include "imx-pcm.h"
-
-int snd_imx_pcm_mmap(struct snd_pcm_substream *substream,
- struct vm_area_struct *vma)
-{
- struct snd_pcm_runtime *runtime = substream->runtime;
- int ret;
-
- ret = dma_mmap_writecombine(substream->pcm->card->dev, vma,
- runtime->dma_area, runtime->dma_addr, runtime->dma_bytes);
-
- pr_debug("%s: ret: %d %p 0x%08x 0x%08x\n", __func__, ret,
- runtime->dma_area,
- runtime->dma_addr,
- runtime->dma_bytes);
- return ret;
-}
-EXPORT_SYMBOL_GPL(snd_imx_pcm_mmap);
-
-static int imx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream)
-{
- struct snd_pcm_substream *substream = pcm->streams[stream].substream;
- struct snd_dma_buffer *buf = &substream->dma_buffer;
- size_t size = IMX_SSI_DMABUF_SIZE;
-
- buf->dev.type = SNDRV_DMA_TYPE_DEV;
- buf->dev.dev = pcm->card->dev;
- buf->private_data = NULL;
- buf->area = dma_alloc_writecombine(pcm->card->dev, size,
- &buf->addr, GFP_KERNEL);
- if (!buf->area)
- return -ENOMEM;
- buf->bytes = size;
-
- return 0;
-}
-
-static u64 imx_pcm_dmamask = DMA_BIT_MASK(32);
-
-int imx_pcm_new(struct snd_soc_pcm_runtime *rtd)
-{
- struct snd_card *card = rtd->card->snd_card;
- struct snd_pcm *pcm = rtd->pcm;
- int ret = 0;
-
- if (!card->dev->dma_mask)
- card->dev->dma_mask = &imx_pcm_dmamask;
- if (!card->dev->coherent_dma_mask)
- card->dev->coherent_dma_mask = DMA_BIT_MASK(32);
- if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
- ret = imx_pcm_preallocate_dma_buffer(pcm,
- SNDRV_PCM_STREAM_PLAYBACK);
- if (ret)
- goto out;
- }
-
- if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
- ret = imx_pcm_preallocate_dma_buffer(pcm,
- SNDRV_PCM_STREAM_CAPTURE);
- if (ret)
- goto out;
- }
-
-out:
- return ret;
-}
-EXPORT_SYMBOL_GPL(imx_pcm_new);
-
-void imx_pcm_free(struct snd_pcm *pcm)
-{
- struct snd_pcm_substream *substream;
- struct snd_dma_buffer *buf;
- int stream;
-
- for (stream = 0; stream < 2; stream++) {
- substream = pcm->streams[stream].substream;
- if (!substream)
- continue;
-
- buf = &substream->dma_buffer;
- if (!buf->area)
- continue;
-
- dma_free_writecombine(pcm->card->dev, buf->bytes,
- buf->area, buf->addr);
- buf->area = NULL;
- }
-}
-EXPORT_SYMBOL_GPL(imx_pcm_free);
-
-static int imx_pcm_probe(struct platform_device *pdev)
-{
- if (strcmp(pdev->id_entry->name, "imx-fiq-pcm-audio") == 0)
- return imx_pcm_fiq_init(pdev);
-
- return imx_pcm_dma_init(pdev);
-}
-
-static int imx_pcm_remove(struct platform_device *pdev)
-{
- if (strcmp(pdev->id_entry->name, "imx-fiq-pcm-audio") == 0)
- imx_pcm_fiq_exit(pdev);
- else
- imx_pcm_dma_exit(pdev);
-
- return 0;
-}
-
-static struct platform_device_id imx_pcm_devtype[] = {
- { .name = "imx-pcm-audio", },
- { .name = "imx-fiq-pcm-audio", },
- { /* sentinel */ }
-};
-MODULE_DEVICE_TABLE(platform, imx_pcm_devtype);
-
-static struct platform_driver imx_pcm_driver = {
- .driver = {
- .name = "imx-pcm",
- .owner = THIS_MODULE,
- },
- .id_table = imx_pcm_devtype,
- .probe = imx_pcm_probe,
- .remove = imx_pcm_remove,
-};
-module_platform_driver(imx_pcm_driver);
-
-MODULE_DESCRIPTION("Freescale i.MX PCM driver");
-MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>");
-MODULE_LICENSE("GPL");
diff --git a/sound/soc/fsl/imx-pcm.h b/sound/soc/fsl/imx-pcm.h
index 073bf38..67f656c 100644
--- a/sound/soc/fsl/imx-pcm.h
+++ b/sound/soc/fsl/imx-pcm.h
@@ -32,11 +32,6 @@ imx_pcm_dma_params_init_data(struct imx_dma_data *dma_data,
dma_data->peripheral_type = IMX_DMATYPE_SSI;
}
-int snd_imx_pcm_mmap(struct snd_pcm_substream *substream,
- struct vm_area_struct *vma);
-int imx_pcm_new(struct snd_soc_pcm_runtime *rtd);
-void imx_pcm_free(struct snd_pcm *pcm);
-
#ifdef CONFIG_SND_SOC_IMX_PCM_DMA
int imx_pcm_dma_init(struct platform_device *pdev);
void imx_pcm_dma_exit(struct platform_device *pdev);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH 0/5] ASoC: fsl: imx-pcm driver cleanup
2013-04-25 3:18 [PATCH 0/5] ASoC: fsl: imx-pcm driver cleanup Shawn Guo
` (4 preceding siblings ...)
2013-04-25 3:18 ` [PATCH 5/5] ASoC: fsl: remove imx-pcm driver Shawn Guo
@ 2013-05-07 8:54 ` Shawn Guo
2013-05-07 10:27 ` Mark Brown
5 siblings, 1 reply; 14+ messages in thread
From: Shawn Guo @ 2013-05-07 8:54 UTC (permalink / raw)
To: Mark Brown; +Cc: Fabio Estevam, alsa-devel, kernel
On Thu, Apr 25, 2013 at 11:18:45AM +0800, Shawn Guo wrote:
> The series removes the use of imx-pcm-audio/imx-fiq-pcm-audio platform
> device, and deletes imx-pcm driver by moving the functions needed by
> imx-pcm-fiq driver into imx-pcm-fiq.c. This can be done because
> imx-pcm-dma has moved to generic dmaengine pcm driver and does not use
> any helper from imx-pcm driver now.
>
> Shawn Guo (5):
> ASoC: fsl: remove use of imx-pcm-audio from fsl_ssi
> ASoC: fsl: remove use of imx-pcm-audio from imx-ssi
> ASoC: fsl: create function imx_pcm_fiq_exit()
> ASoC: fsl: remove use of imx-fiq-pcm-audio from imx-ssi
> ASoC: fsl: remove imx-pcm driver
Ping.
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH 0/5] ASoC: fsl: imx-pcm driver cleanup
2013-05-07 8:54 ` [PATCH 0/5] ASoC: fsl: imx-pcm driver cleanup Shawn Guo
@ 2013-05-07 10:27 ` Mark Brown
2013-05-07 11:16 ` Shawn Guo
0 siblings, 1 reply; 14+ messages in thread
From: Mark Brown @ 2013-05-07 10:27 UTC (permalink / raw)
To: Shawn Guo; +Cc: Fabio Estevam, alsa-devel, kernel
On Tue, May 07, 2013 at 04:54:00PM +0800, Shawn Guo wrote:
> Ping.
Don't send contentless pings.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 0/5] ASoC: fsl: imx-pcm driver cleanup
2013-05-07 10:27 ` Mark Brown
@ 2013-05-07 11:16 ` Shawn Guo
2013-05-07 11:18 ` Shawn Guo
2013-05-07 11:34 ` Mark Brown
0 siblings, 2 replies; 14+ messages in thread
From: Shawn Guo @ 2013-05-07 11:16 UTC (permalink / raw)
To: Mark Brown; +Cc: Fabio Estevam, alsa-devel, kernel
On Tue, May 07, 2013 at 11:27:01AM +0100, Mark Brown wrote:
> On Tue, May 07, 2013 at 04:54:00PM +0800, Shawn Guo wrote:
>
> > Ping.
>
> Don't send contentless pings.
Hmm? How many pings do you get from me on this thread? I remember this
is the first time I ping you on this.
Shawn
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 0/5] ASoC: fsl: imx-pcm driver cleanup
2013-05-07 11:16 ` Shawn Guo
@ 2013-05-07 11:18 ` Shawn Guo
2013-05-07 11:34 ` Mark Brown
1 sibling, 0 replies; 14+ messages in thread
From: Shawn Guo @ 2013-05-07 11:18 UTC (permalink / raw)
To: Mark Brown; +Cc: Fabio Estevam, alsa-devel, kernel
On Tue, May 07, 2013 at 07:16:21PM +0800, Shawn Guo wrote:
> On Tue, May 07, 2013 at 11:27:01AM +0100, Mark Brown wrote:
> > On Tue, May 07, 2013 at 04:54:00PM +0800, Shawn Guo wrote:
> >
> > > Ping.
> >
> > Don't send contentless pings.
>
> Hmm? How many pings do you get from me on this thread? I remember this
> is the first time I ping you on this.
Sorry, I misread contentless as countless :)
Shawn
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 0/5] ASoC: fsl: imx-pcm driver cleanup
2013-05-07 11:16 ` Shawn Guo
2013-05-07 11:18 ` Shawn Guo
@ 2013-05-07 11:34 ` Mark Brown
2013-05-07 12:06 ` Shawn Guo
1 sibling, 1 reply; 14+ messages in thread
From: Mark Brown @ 2013-05-07 11:34 UTC (permalink / raw)
To: Shawn Guo; +Cc: Fabio Estevam, alsa-devel, kernel
[-- Attachment #1.1: Type: text/plain, Size: 445 bytes --]
On Tue, May 07, 2013 at 07:16:21PM +0800, Shawn Guo wrote:
> On Tue, May 07, 2013 at 11:27:01AM +0100, Mark Brown wrote:
> > On Tue, May 07, 2013 at 04:54:00PM +0800, Shawn Guo wrote:
> > > Ping.
> > Don't send contentless pings.
> Hmm? How many pings do you get from me on this thread? I remember this
> is the first time I ping you on this.
The important word here is "contentless". Your mail contained no useful
or actionable content.
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 0/5] ASoC: fsl: imx-pcm driver cleanup
2013-05-07 11:34 ` Mark Brown
@ 2013-05-07 12:06 ` Shawn Guo
2013-05-07 13:41 ` Mark Brown
0 siblings, 1 reply; 14+ messages in thread
From: Shawn Guo @ 2013-05-07 12:06 UTC (permalink / raw)
To: Mark Brown; +Cc: Fabio Estevam, alsa-devel, kernel
On Tue, May 07, 2013 at 12:34:41PM +0100, Mark Brown wrote:
> On Tue, May 07, 2013 at 07:16:21PM +0800, Shawn Guo wrote:
> > On Tue, May 07, 2013 at 11:27:01AM +0100, Mark Brown wrote:
> > > On Tue, May 07, 2013 at 04:54:00PM +0800, Shawn Guo wrote:
>
> > > > Ping.
>
> > > Don't send contentless pings.
>
> > Hmm? How many pings do you get from me on this thread? I remember this
> > is the first time I ping you on this.
>
> The important word here is "contentless". Your mail contained no useful
> or actionable content.
I'm asking if the series looks good to be applied (presumably for 3.11,
since it's quite impossible for 3.10 now) for applying, or there is
anything needs rework.
Shawn
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 0/5] ASoC: fsl: imx-pcm driver cleanup
2013-05-07 12:06 ` Shawn Guo
@ 2013-05-07 13:41 ` Mark Brown
0 siblings, 0 replies; 14+ messages in thread
From: Mark Brown @ 2013-05-07 13:41 UTC (permalink / raw)
To: Shawn Guo; +Cc: Fabio Estevam, alsa-devel, kernel
[-- Attachment #1.1: Type: text/plain, Size: 706 bytes --]
On Tue, May 07, 2013 at 08:06:40PM +0800, Shawn Guo wrote:
> On Tue, May 07, 2013 at 12:34:41PM +0100, Mark Brown wrote:
> > The important word here is "contentless". Your mail contained no useful
> > or actionable content.
> I'm asking if the series looks good to be applied (presumably for 3.11,
> since it's quite impossible for 3.10 now) for applying, or there is
> anything needs rework.
I'm certainly not going to look at it till after the merge window and
given that there's at least two people trying to work on the code at the
minute I'd at least expect some reviews. In general if you think
patches are being dropped then resend them, if things are lost they've
probably actually been lost.
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread