* [PATCH v9 01/10] ASoC: imx-pcm-dma: DT support
2013-06-20 13:20 ASoC: fsl-ssi: ac97-slave support Markus Pargmann
@ 2013-06-20 13:20 ` Markus Pargmann
2013-06-23 17:49 ` Timur Tabi
2013-07-03 16:02 ` Mark Brown
2013-06-20 13:20 ` [PATCH v9 02/10] ASoC: imx-pcm-fiq: Introduce pcm-fiq-params Markus Pargmann
` (8 subsequent siblings)
9 siblings, 2 replies; 26+ messages in thread
From: Markus Pargmann @ 2013-06-20 13:20 UTC (permalink / raw)
To: linux-arm-kernel
This patch removes the NO_DT flag. The pdev pointer may have a proper
of_node with the dmas property, so we can use it to request DMA
channels.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
---
Notes:
Changes in v6:
- After rebasing onto Shawn's imx-pcm cleanups, this patch just consists of
removing the NO_DT flag.
Changes in v5:
- Use dev.parent pointer to get the of_node.
sound/soc/fsl/imx-pcm-dma.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/sound/soc/fsl/imx-pcm-dma.c b/sound/soc/fsl/imx-pcm-dma.c
index fde4d2e..f323ce0 100644
--- a/sound/soc/fsl/imx-pcm-dma.c
+++ b/sound/soc/fsl/imx-pcm-dma.c
@@ -64,7 +64,6 @@ int imx_pcm_dma_init(struct platform_device *pdev)
{
return snd_dmaengine_pcm_register(&pdev->dev, &imx_dmaengine_pcm_config,
SND_DMAENGINE_PCM_FLAG_NO_RESIDUE |
- SND_DMAENGINE_PCM_FLAG_NO_DT |
SND_DMAENGINE_PCM_FLAG_COMPAT);
}
EXPORT_SYMBOL_GPL(imx_pcm_dma_init);
--
1.8.2.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v9 01/10] ASoC: imx-pcm-dma: DT support
2013-06-20 13:20 ` [PATCH v9 01/10] ASoC: imx-pcm-dma: DT support Markus Pargmann
@ 2013-06-23 17:49 ` Timur Tabi
2013-07-05 13:56 ` Markus Pargmann
2013-07-03 16:02 ` Mark Brown
1 sibling, 1 reply; 26+ messages in thread
From: Timur Tabi @ 2013-06-23 17:49 UTC (permalink / raw)
To: linux-arm-kernel
Markus Pargmann wrote:
> This patch removes the NO_DT flag. The pdev pointer may have a proper
> of_node with the dmas property, so we can use it to request DMA
> channels.
>
> Signed-off-by: Markus Pargmann<mpa@pengutronix.de>
> Tested-by: Shawn Guo<shawn.guo@linaro.org>
> ---
I won't have access to functioning hardware for another month or two, so I
can't test to see if this patchset breaks PowerPC, but at least it does
compile. I'm a little worried that the DMA changes won't actually run on
PowerPC, but I can't test that now.
So for the time being:
Acked-by: Timur Tabi <timur@tabi.org>
--
Timur Tabi
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v9 01/10] ASoC: imx-pcm-dma: DT support
2013-06-23 17:49 ` Timur Tabi
@ 2013-07-05 13:56 ` Markus Pargmann
0 siblings, 0 replies; 26+ messages in thread
From: Markus Pargmann @ 2013-07-05 13:56 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Jun 23, 2013 at 12:49:17PM -0500, Timur Tabi wrote:
> Markus Pargmann wrote:
> > This patch removes the NO_DT flag. The pdev pointer may have a proper
> > of_node with the dmas property, so we can use it to request DMA
> > channels.
> >
> > Signed-off-by: Markus Pargmann<mpa@pengutronix.de>
> > Tested-by: Shawn Guo<shawn.guo@linaro.org>
> > ---
>
> I won't have access to functioning hardware for another month or two, so I
> can't test to see if this patchset breaks PowerPC, but at least it does
> compile. I'm a little worried that the DMA changes won't actually run on
> PowerPC, but I can't test that now.
The DMA channels should end up to be NULL on PowerPC within the generic
dmaengine pcm, so it should fall back to NO_DT automatically.
>
> So for the time being:
>
> Acked-by: Timur Tabi <timur@tabi.org>
>
> --
> Timur Tabi
>
Thanks,
Markus
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v9 01/10] ASoC: imx-pcm-dma: DT support
2013-06-20 13:20 ` [PATCH v9 01/10] ASoC: imx-pcm-dma: DT support Markus Pargmann
2013-06-23 17:49 ` Timur Tabi
@ 2013-07-03 16:02 ` Mark Brown
1 sibling, 0 replies; 26+ messages in thread
From: Mark Brown @ 2013-07-03 16:02 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jun 20, 2013 at 03:20:20PM +0200, Markus Pargmann wrote:
> This patch removes the NO_DT flag. The pdev pointer may have a proper
> of_node with the dmas property, so we can use it to request DMA
> channels.
Applied, thanks.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130703/88ac9765/attachment.sig>
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v9 02/10] ASoC: imx-pcm-fiq: Introduce pcm-fiq-params
2013-06-20 13:20 ASoC: fsl-ssi: ac97-slave support Markus Pargmann
2013-06-20 13:20 ` [PATCH v9 01/10] ASoC: imx-pcm-dma: DT support Markus Pargmann
@ 2013-06-20 13:20 ` Markus Pargmann
2013-07-03 16:02 ` Mark Brown
2013-06-20 13:20 ` [PATCH v9 03/10] ASoC: fsl: Move soc_ac97_ops from imx-ssi to fsl_ssi Markus Pargmann
` (7 subsequent siblings)
9 siblings, 1 reply; 26+ messages in thread
From: Markus Pargmann @ 2013-06-20 13:20 UTC (permalink / raw)
To: linux-arm-kernel
Cleaner parameter passing for imx-pcm-fiq. Create a seperated fiq-params
struct to pass all arguments.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
---
Notes:
Changes in v9:
- Remove semicolon in function
Changes in v7:
- Fix init function signature for !CONFIG_SND_SOC_IMX_PCM_FIQ
Changes in v6:
- After rebasing onto Shawn's imx-pcm cleanups, the imx_pcm_fiq_params are now
passed as function arguments instead of platform driver data.
Changes in v3:
- Using snd_dmaengine_dai_dma_data for dma_params after rebasing onto
dmaengine cleanups.
sound/soc/fsl/imx-pcm-fiq.c | 18 ++++++++++--------
sound/soc/fsl/imx-pcm.h | 15 +++++++++++++--
sound/soc/fsl/imx-ssi.c | 7 ++++++-
sound/soc/fsl/imx-ssi.h | 1 +
4 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/sound/soc/fsl/imx-pcm-fiq.c b/sound/soc/fsl/imx-pcm-fiq.c
index 310d902..3b2ba99 100644
--- a/sound/soc/fsl/imx-pcm-fiq.c
+++ b/sound/soc/fsl/imx-pcm-fiq.c
@@ -22,6 +22,7 @@
#include <linux/slab.h>
#include <sound/core.h>
+#include <sound/dmaengine_pcm.h>
#include <sound/initval.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
@@ -32,6 +33,7 @@
#include <linux/platform_data/asoc-imx-ssi.h>
#include "imx-ssi.h"
+#include "imx-pcm.h"
struct imx_pcm_runtime_data {
unsigned int period;
@@ -366,9 +368,9 @@ static struct snd_soc_platform_driver imx_soc_platform_fiq = {
.pcm_free = imx_pcm_fiq_free,
};
-int imx_pcm_fiq_init(struct platform_device *pdev)
+int imx_pcm_fiq_init(struct platform_device *pdev,
+ struct imx_pcm_fiq_params *params)
{
- struct imx_ssi *ssi = platform_get_drvdata(pdev);
int ret;
ret = claim_fiq(&fh);
@@ -377,15 +379,15 @@ int imx_pcm_fiq_init(struct platform_device *pdev)
return ret;
}
- mxc_set_irq_fiq(ssi->irq, 1);
- ssi_irq = ssi->irq;
+ mxc_set_irq_fiq(params->irq, 1);
+ ssi_irq = params->irq;
- imx_pcm_fiq = ssi->irq;
+ imx_pcm_fiq = params->irq;
- imx_ssi_fiq_base = (unsigned long)ssi->base;
+ imx_ssi_fiq_base = (unsigned long)params->base;
- ssi->dma_params_tx.maxburst = 4;
- ssi->dma_params_rx.maxburst = 6;
+ params->dma_params_tx->maxburst = 4;
+ params->dma_params_rx->maxburst = 6;
ret = snd_soc_register_platform(&pdev->dev, &imx_soc_platform_fiq);
if (ret)
diff --git a/sound/soc/fsl/imx-pcm.h b/sound/soc/fsl/imx-pcm.h
index 67f656c..fd56cad 100644
--- a/sound/soc/fsl/imx-pcm.h
+++ b/sound/soc/fsl/imx-pcm.h
@@ -32,6 +32,15 @@ imx_pcm_dma_params_init_data(struct imx_dma_data *dma_data,
dma_data->peripheral_type = IMX_DMATYPE_SSI;
}
+struct imx_pcm_fiq_params {
+ int irq;
+ void __iomem *base;
+
+ /* Pointer to original ssi driver to setup tx rx sizes */
+ struct snd_dmaengine_dai_dma_data *dma_params_rx;
+ struct snd_dmaengine_dai_dma_data *dma_params_tx;
+};
+
#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);
@@ -47,10 +56,12 @@ static inline void imx_pcm_dma_exit(struct platform_device *pdev)
#endif
#ifdef CONFIG_SND_SOC_IMX_PCM_FIQ
-int imx_pcm_fiq_init(struct platform_device *pdev);
+int imx_pcm_fiq_init(struct platform_device *pdev,
+ struct imx_pcm_fiq_params *params);
void imx_pcm_fiq_exit(struct platform_device *pdev);
#else
-static inline int imx_pcm_fiq_init(struct platform_device *pdev)
+static inline int imx_pcm_fiq_init(struct platform_device *pdev,
+ struct imx_pcm_fiq_params *params)
{
return -ENODEV;
}
diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c
index a8362be..16ae16d 100644
--- a/sound/soc/fsl/imx-ssi.c
+++ b/sound/soc/fsl/imx-ssi.c
@@ -590,7 +590,12 @@ static int imx_ssi_probe(struct platform_device *pdev)
goto failed_register;
}
- ret = imx_pcm_fiq_init(pdev);
+ ssi->fiq_params.irq = ssi->irq;
+ ssi->fiq_params.base = ssi->base;
+ ssi->fiq_params.dma_params_rx = &ssi->dma_params_rx;
+ ssi->fiq_params.dma_params_tx = &ssi->dma_params_tx;
+
+ ret = imx_pcm_fiq_init(pdev, &ssi->fiq_params);
if (ret)
goto failed_pcm_fiq;
diff --git a/sound/soc/fsl/imx-ssi.h b/sound/soc/fsl/imx-ssi.h
index d5003ce..fb1616b 100644
--- a/sound/soc/fsl/imx-ssi.h
+++ b/sound/soc/fsl/imx-ssi.h
@@ -209,6 +209,7 @@ struct imx_ssi {
struct snd_dmaengine_dai_dma_data dma_params_tx;
struct imx_dma_data filter_data_tx;
struct imx_dma_data filter_data_rx;
+ struct imx_pcm_fiq_params fiq_params;
int enabled;
};
--
1.8.2.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v9 03/10] ASoC: fsl: Move soc_ac97_ops from imx-ssi to fsl_ssi
2013-06-20 13:20 ASoC: fsl-ssi: ac97-slave support Markus Pargmann
2013-06-20 13:20 ` [PATCH v9 01/10] ASoC: imx-pcm-dma: DT support Markus Pargmann
2013-06-20 13:20 ` [PATCH v9 02/10] ASoC: imx-pcm-fiq: Introduce pcm-fiq-params Markus Pargmann
@ 2013-06-20 13:20 ` Markus Pargmann
2013-07-03 16:07 ` Mark Brown
2013-06-20 13:20 ` [PATCH v9 04/10] ASoC: fsl-ssi: Add support for imx-pcm-fiq Markus Pargmann
` (6 subsequent siblings)
9 siblings, 1 reply; 26+ messages in thread
From: Markus Pargmann @ 2013-06-20 13:20 UTC (permalink / raw)
To: linux-arm-kernel
fsl_ssi and imx-ssi can be both enabled at the same time. To be able to
add AC97 support to fsl_ssi, soc_ac97_ops have to be available to both
drivers.
fsl_ssi has DT support and should be the only driver at some point in
the future. This patch moves the definition of soc_ac97_ops to fsl_ssi.
imx-ssi copies its own ac97 ops struct into soc_ac97_ops when used in
AC97 mode.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
---
sound/soc/fsl/Kconfig | 1 +
sound/soc/fsl/fsl_ssi.c | 8 ++++++++
sound/soc/fsl/imx-ssi.c | 7 +++++--
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 7860cc2..74ef96e 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -107,6 +107,7 @@ if SND_IMX_SOC
config SND_SOC_IMX_SSI
tristate
+ select SND_SOC_FSL_SSI
config SND_SOC_IMX_PCM_FIQ
bool
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 2f2d837..db55499 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -587,6 +587,14 @@ static const struct snd_soc_component_driver fsl_ssi_component = {
.name = "fsl-ssi",
};
+/*
+ * FIXME: As soon as all boards using imx-ssi AC97 mode are able to use
+ * fsl-ssi, soc_ac97_ops can be used exclusively in this driver without copying
+ * the struct. AC97 support can then be removed from imx-ssi.
+ */
+struct snd_ac97_bus_ops soc_ac97_ops;
+EXPORT_SYMBOL_GPL(soc_ac97_ops);
+
/* Show the statistics of a flag only if its interrupt is enabled. The
* compiler will optimze this code to a no-op if the interrupt is not
* enabled.
diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c
index 16ae16d..3760220 100644
--- a/sound/soc/fsl/imx-ssi.c
+++ b/sound/soc/fsl/imx-ssi.c
@@ -501,13 +501,14 @@ static void imx_ssi_ac97_warm_reset(struct snd_ac97 *ac97)
imx_ssi_ac97_read(ac97, 0);
}
-struct snd_ac97_bus_ops soc_ac97_ops = {
+static struct snd_ac97_bus_ops imx_ssi_soc_ac97_ops = {
.read = imx_ssi_ac97_read,
.write = imx_ssi_ac97_write,
.reset = imx_ssi_ac97_reset,
.warm_reset = imx_ssi_ac97_warm_reset
};
-EXPORT_SYMBOL_GPL(soc_ac97_ops);
+
+extern struct snd_ac97_bus_ops soc_ac97_ops;
static int imx_ssi_probe(struct platform_device *pdev)
{
@@ -547,6 +548,8 @@ static int imx_ssi_probe(struct platform_device *pdev)
}
if (ssi->flags & IMX_SSI_USE_AC97) {
+ memcpy(&soc_ac97_ops, &imx_ssi_soc_ac97_ops,
+ sizeof(soc_ac97_ops));
if (ac97_ssi) {
dev_err(&pdev->dev, "AC'97 SSI already registered\n");
ret = -EBUSY;
--
1.8.2.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v9 04/10] ASoC: fsl-ssi: Add support for imx-pcm-fiq
2013-06-20 13:20 ASoC: fsl-ssi: ac97-slave support Markus Pargmann
` (2 preceding siblings ...)
2013-06-20 13:20 ` [PATCH v9 03/10] ASoC: fsl: Move soc_ac97_ops from imx-ssi to fsl_ssi Markus Pargmann
@ 2013-06-20 13:20 ` Markus Pargmann
2013-07-03 16:06 ` Mark Brown
2013-06-20 13:20 ` [PATCH v9 05/10] ASoC: fsl-ssi: Use generic DMA bindings if possible Markus Pargmann
` (5 subsequent siblings)
9 siblings, 1 reply; 26+ messages in thread
From: Markus Pargmann @ 2013-06-20 13:20 UTC (permalink / raw)
To: linux-arm-kernel
Add support for non-dma pcm for imx platforms with imx-pcm-fiq support.
Instead of imx-pcm-audio, in this case imx-pcm-fiq-audio device is added
and the SIER flags are set differently.
We need imx-pcm-fiq for some boards that use an incompatible codec.
imx-pcm-fiq handles those codecs differently and allows to operate with
them. DMA is not possible because some data sent by the codecs, e.g.
wm9712, is not in the datastream. Also some data is mixed up in the
fifos, so that we need to sort them out manually.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
---
Notes:
Changes in v4:
- Add a comment about the reason why we add a imx-pcm-fiq device.
- Change commit message to include information about the usage of imx-pcm-fiq
Changes in v3:
- Rename bool "dma" to "use_dma"
sound/soc/fsl/fsl_ssi.c | 77 +++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 65 insertions(+), 12 deletions(-)
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index db55499..2fe4dbd 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -8,6 +8,26 @@
* This file is licensed under the terms of the GNU General Public License
* version 2. This program is licensed "as is" without any warranty of any
* kind, whether express or implied.
+ *
+ *
+ * Some notes why imx-pcm-fiq is used instead of DMA on some boards:
+ *
+ * The i.MX SSI core has some nasty limitations in AC97 mode. While most
+ * sane processor vendors have a FIFO per AC97 slot, the i.MX has only
+ * one FIFO which combines all valid receive slots. We cannot even select
+ * which slots we want to receive. The WM9712 with which this driver
+ * was developed with always sends GPIO status data in slot 12 which
+ * we receive in our (PCM-) data stream. The only chance we have is to
+ * manually skip this data in the FIQ handler. With sampling rates different
+ * from 48000Hz not every frame has valid receive data, so the ratio
+ * between pcm data and GPIO status data changes. Our FIQ handler is not
+ * able to handle this, hence this driver only works with 48000Hz sampling
+ * rate.
+ * Reading and writing AC97 registers is another challenge. The core
+ * provides us status bits when the read register is updated with *another*
+ * value. When we read the same register two times (and the register still
+ * contains the same value) these status bits are not set. We work
+ * around this by not polling these bits but only wait a fixed delay.
*/
#include <linux/init.h>
@@ -121,11 +141,13 @@ struct fsl_ssi_private {
bool new_binding;
bool ssi_on_imx;
+ bool use_dma;
struct clk *clk;
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;
struct imx_dma_data filter_data_rx;
+ struct imx_pcm_fiq_params fiq_params;
struct {
unsigned int rfrc;
@@ -355,7 +377,12 @@ static int fsl_ssi_startup(struct snd_pcm_substream *substream,
*/
/* Enable the interrupts and DMA requests */
- write_ssi(SIER_FLAGS, &ssi->sier);
+ if (ssi_private->use_dma)
+ write_ssi(SIER_FLAGS, &ssi->sier);
+ else
+ write_ssi(CCSR_SSI_SIER_TIE | CCSR_SSI_SIER_TFE0_EN |
+ CCSR_SSI_SIER_RIE |
+ CCSR_SSI_SIER_RFF0_EN, &ssi->sier);
/*
* Set the watermark for transmit FIFI 0 and receive FIFO 0. We
@@ -549,7 +576,7 @@ static int fsl_ssi_dai_probe(struct snd_soc_dai *dai)
{
struct fsl_ssi_private *ssi_private = snd_soc_dai_get_drvdata(dai);
- if (ssi_private->ssi_on_imx) {
+ if (ssi_private->ssi_on_imx && ssi_private->use_dma) {
dai->playback_dma_data = &ssi_private->dma_params_tx;
dai->capture_dma_data = &ssi_private->dma_params_rx;
}
@@ -702,6 +729,8 @@ static int fsl_ssi_probe(struct platform_device *pdev)
sizeof(fsl_ssi_dai_template));
ssi_private->cpu_dai_drv.name = ssi_private->name;
+ ssi_private->use_dma = !of_property_read_bool(np, "fsl,imx-fiq");
+
/* Get the addresses and IRQ */
ret = of_address_to_resource(np, 0, &res);
if (ret) {
@@ -723,12 +752,15 @@ static int fsl_ssi_probe(struct platform_device *pdev)
goto error_iomap;
}
- /* The 'name' should not have any slashes in it. */
- ret = request_irq(ssi_private->irq, fsl_ssi_isr, 0, ssi_private->name,
- ssi_private);
- if (ret < 0) {
- dev_err(&pdev->dev, "could not claim irq %u\n", ssi_private->irq);
- goto error_irqmap;
+ if (ssi_private->use_dma) {
+ /* The 'name' should not have any slashes in it. */
+ ret = request_irq(ssi_private->irq, fsl_ssi_isr, 0,
+ ssi_private->name, ssi_private);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "could not claim irq %u\n",
+ ssi_private->irq);
+ goto error_irqmap;
+ }
}
/* Are the RX and the TX clocks locked? */
@@ -777,7 +809,7 @@ static int fsl_ssi_probe(struct platform_device *pdev)
*/
ret = of_property_read_u32_array(pdev->dev.of_node,
"fsl,ssi-dma-events", dma_events, 2);
- if (ret) {
+ if (ret && !ssi_private->use_dma) {
dev_err(&pdev->dev, "could not get dma events\n");
goto error_clk;
}
@@ -816,9 +848,30 @@ static int fsl_ssi_probe(struct platform_device *pdev)
}
if (ssi_private->ssi_on_imx) {
- ret = imx_pcm_dma_init(pdev);
- if (ret)
- goto error_dev;
+ if (!ssi_private->use_dma) {
+
+ /*
+ * Some boards use an incompatible codec. To get it
+ * working, we are using imx-fiq-pcm-audio, that
+ * can handle those codecs. DMA is not possible in this
+ * situation.
+ */
+
+ ssi_private->fiq_params.irq = ssi_private->irq;
+ ssi_private->fiq_params.base = ssi_private->ssi;
+ ssi_private->fiq_params.dma_params_rx =
+ &ssi_private->dma_params_rx;
+ ssi_private->fiq_params.dma_params_tx =
+ &ssi_private->dma_params_tx;
+
+ ret = imx_pcm_fiq_init(pdev, &ssi_private->fiq_params);
+ if (ret)
+ goto error_dev;
+ } else {
+ ret = imx_pcm_dma_init(pdev);
+ if (ret)
+ goto error_dev;
+ }
}
/*
--
1.8.2.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v9 04/10] ASoC: fsl-ssi: Add support for imx-pcm-fiq
2013-06-20 13:20 ` [PATCH v9 04/10] ASoC: fsl-ssi: Add support for imx-pcm-fiq Markus Pargmann
@ 2013-07-03 16:06 ` Mark Brown
2013-07-06 17:13 ` Markus Pargmann
0 siblings, 1 reply; 26+ messages in thread
From: Mark Brown @ 2013-07-03 16:06 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jun 20, 2013 at 03:20:23PM +0200, Markus Pargmann wrote:
> + ssi_private->use_dma = !of_property_read_bool(np, "fsl,imx-fiq");
> +
This binding should be documented. I'm not sure it really needs to be
a binding, though - is it not possible for the driver to just figure out
that DMA won't work automatically (for example by looking at the CODEC
in use)? I'm not sure this is a good name either, it should be saying
why the FIQ is needed rather than saying that we should use the FIQ.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130703/3c369fbd/attachment.sig>
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v9 04/10] ASoC: fsl-ssi: Add support for imx-pcm-fiq
2013-07-03 16:06 ` Mark Brown
@ 2013-07-06 17:13 ` Markus Pargmann
2013-07-08 8:04 ` Mark Brown
0 siblings, 1 reply; 26+ messages in thread
From: Markus Pargmann @ 2013-07-06 17:13 UTC (permalink / raw)
To: linux-arm-kernel
Hi Mark,
On Wed, Jul 03, 2013 at 05:06:37PM +0100, Mark Brown wrote:
> On Thu, Jun 20, 2013 at 03:20:23PM +0200, Markus Pargmann wrote:
>
> > + ssi_private->use_dma = !of_property_read_bool(np, "fsl,imx-fiq");
> > +
>
> This binding should be documented. I'm not sure it really needs to be
> a binding, though - is it not possible for the driver to just figure out
> that DMA won't work automatically (for example by looking at the CODEC
> in use)? I'm not sure this is a good name either, it should be saying
> why the FIQ is needed rather than saying that we should use the FIQ.
I think fsl_ssi_startup is the first function in which we know which
codec is connected to fsl-ssi. There we have access to the pcm runtime,
which stores the codec used. But that is too late for the ssi setup.
I could use of_find_compatible_node to search for the wm9712 codec, but
that would assume that there is only one codec attached to the system.
Perhaps "fsl,fiq-filter-codec-stream" is a better name for the binding?
Regards,
Markus
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v9 04/10] ASoC: fsl-ssi: Add support for imx-pcm-fiq
2013-07-06 17:13 ` Markus Pargmann
@ 2013-07-08 8:04 ` Mark Brown
0 siblings, 0 replies; 26+ messages in thread
From: Mark Brown @ 2013-07-08 8:04 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, Jul 06, 2013 at 07:13:23PM +0200, Markus Pargmann wrote:
> On Wed, Jul 03, 2013 at 05:06:37PM +0100, Mark Brown wrote:
> > On Thu, Jun 20, 2013 at 03:20:23PM +0200, Markus Pargmann wrote:
> > > + ssi_private->use_dma = !of_property_read_bool(np, "fsl,imx-fiq");
> > This binding should be documented. I'm not sure it really needs to be
> > a binding, though - is it not possible for the driver to just figure out
> > that DMA won't work automatically (for example by looking at the CODEC
> > in use)? I'm not sure this is a good name either, it should be saying
> > why the FIQ is needed rather than saying that we should use the FIQ.
> I think fsl_ssi_startup is the first function in which we know which
> codec is connected to fsl-ssi. There we have access to the pcm runtime,
> which stores the codec used. But that is too late for the ssi setup.
> I could use of_find_compatible_node to search for the wm9712 codec, but
> that would assume that there is only one codec attached to the system.
If the SSI is doing anything it will be connected to a CODEC. If it's
not connected to a CODEC then it doesn't need to be configured at all so
it doesn't really matter.
> Perhaps "fsl,fiq-filter-codec-stream" is a better name for the binding?
Possibly.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130708/45225acd/attachment.sig>
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v9 05/10] ASoC: fsl-ssi: Use generic DMA bindings if possible
2013-06-20 13:20 ASoC: fsl-ssi: ac97-slave support Markus Pargmann
` (3 preceding siblings ...)
2013-06-20 13:20 ` [PATCH v9 04/10] ASoC: fsl-ssi: Add support for imx-pcm-fiq Markus Pargmann
@ 2013-06-20 13:20 ` Markus Pargmann
2013-06-20 13:20 ` [PATCH v9 06/10] ASoC: fsl-ssi: imx ac97 support Markus Pargmann
` (4 subsequent siblings)
9 siblings, 0 replies; 26+ messages in thread
From: Markus Pargmann @ 2013-06-20 13:20 UTC (permalink / raw)
To: linux-arm-kernel
There may be some platforms using fsl-ssi that do not have a DMA driver
with generic DMA bindings. So this patch adds support for the generic
DMA bindings, while still accepting the old "fsl,dma-events" property if
"dmas" is not found.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
---
Notes:
Changes in v5:
- Not passing of_node now, instead setting the parent device
Changes in v4:
- Change TODO comment to a FIXME, to remove the old dma-events property as soon
as all dma drivers support the generic DMA bindings.
sound/soc/fsl/fsl_ssi.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 2fe4dbd..ed1fbbb 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -803,15 +803,19 @@ static int fsl_ssi_probe(struct platform_device *pdev)
&ssi_private->filter_data_tx;
ssi_private->dma_params_rx.filter_data =
&ssi_private->filter_data_rx;
- /*
- * TODO: This is a temporary solution and should be changed
- * to use generic DMA binding later when the helplers get in.
- */
- ret = of_property_read_u32_array(pdev->dev.of_node,
+ if (!of_property_read_bool(pdev->dev.of_node, "dmas") &&
+ ssi_private->use_dma) {
+ /*
+ * FIXME: This is a temporary solution until all
+ * necessary dma drivers support the generic dma
+ * bindings.
+ */
+ ret = of_property_read_u32_array(pdev->dev.of_node,
"fsl,ssi-dma-events", dma_events, 2);
- if (ret && !ssi_private->use_dma) {
- dev_err(&pdev->dev, "could not get dma events\n");
- goto error_clk;
+ if (ret && ssi_private->use_dma) {
+ dev_err(&pdev->dev, "could not get dma events but fsl-ssi is configured to use DMA\n");
+ goto error_clk;
+ }
}
shared = of_device_is_compatible(of_get_parent(np),
--
1.8.2.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v9 06/10] ASoC: fsl-ssi: imx ac97 support
2013-06-20 13:20 ASoC: fsl-ssi: ac97-slave support Markus Pargmann
` (4 preceding siblings ...)
2013-06-20 13:20 ` [PATCH v9 05/10] ASoC: fsl-ssi: Use generic DMA bindings if possible Markus Pargmann
@ 2013-06-20 13:20 ` Markus Pargmann
2013-06-20 13:20 ` [PATCH v9 07/10] ARM: imx: Export ac97 reset functions Markus Pargmann
` (3 subsequent siblings)
9 siblings, 0 replies; 26+ messages in thread
From: Markus Pargmann @ 2013-06-20 13:20 UTC (permalink / raw)
To: linux-arm-kernel
This patch copies some parts from imx-ssi to support AC97 on
imx27-pca100 and imx35-pcm043. This is a implementation of the
ac97-slave mode.
For ac97, the registers have to be setup earlier than for other ssi
modes because there is some communication with the external device
before actual streaming. So this patch introduces a fsl_ssi_setup
function to setup the registers at different times.
To seperate board specific ac97 reset functions, ac97 read/write
functions are exported. The reset functions are set by other drivers.
This patch was tested with imx27-pca100.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
---
Notes:
Changes in v9:
- Minor style fixes.
Changes in v7:
- ac97 ops are now assigned to soc_ac97_ops to allow enabled imx-ssi and
fsl-ssi at the same time.
Changes in v6:
- ac97 reset functions are not provided by fsl-ssi code anymore. They were
moved to board specific code like phycore-ac97. Therefore ac97 read/write
functions are exported and a helper function to set the soc_ac97_ops reset
functions was created.
Changes in v3:
- Cleanup ac97 code by adding a fsl_ssi_setup function for initial register
setup. For ac97 the registers have to be setup earlier than in normal
mode.
sound/soc/fsl/fsl_ssi.c | 364 ++++++++++++++++++++++++++++++++++++++----------
sound/soc/fsl/fsl_ssi.h | 7 +
2 files changed, 299 insertions(+), 72 deletions(-)
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index ed1fbbb..34cc1c8 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -141,6 +141,7 @@ struct fsl_ssi_private {
bool new_binding;
bool ssi_on_imx;
+ bool imx_ac97;
bool use_dma;
struct clk *clk;
struct snd_dmaengine_dai_dma_data dma_params_tx;
@@ -320,6 +321,124 @@ static irqreturn_t fsl_ssi_isr(int irq, void *dev_id)
return ret;
}
+static int fsl_ssi_setup(struct fsl_ssi_private *ssi_private)
+{
+ struct ccsr_ssi __iomem *ssi = ssi_private->ssi;
+ u8 i2s_mode;
+ u8 wm;
+ int synchronous = ssi_private->cpu_dai_drv.symmetric_rates;
+
+ if (ssi_private->imx_ac97)
+ i2s_mode = CCSR_SSI_SCR_I2S_MODE_NORMAL | CCSR_SSI_SCR_NET;
+ else
+ i2s_mode = CCSR_SSI_SCR_I2S_MODE_SLAVE;
+
+ /*
+ * Section 16.5 of the MPC8610 reference manual says that the SSI needs
+ * to be disabled before updating the registers we set here.
+ */
+ write_ssi_mask(&ssi->scr, CCSR_SSI_SCR_SSIEN, 0);
+
+ /*
+ * Program the SSI into I2S Slave Non-Network Synchronous mode. Also
+ * enable the transmit and receive FIFO.
+ *
+ * FIXME: Little-endian samples require a different shift dir
+ */
+ write_ssi_mask(&ssi->scr,
+ CCSR_SSI_SCR_I2S_MODE_MASK | CCSR_SSI_SCR_SYN,
+ CCSR_SSI_SCR_TFR_CLK_DIS |
+ i2s_mode |
+ (synchronous ? CCSR_SSI_SCR_SYN : 0));
+
+ write_ssi(CCSR_SSI_STCR_TXBIT0 | CCSR_SSI_STCR_TFEN0 |
+ CCSR_SSI_STCR_TFSI | CCSR_SSI_STCR_TEFS |
+ CCSR_SSI_STCR_TSCKP, &ssi->stcr);
+
+ write_ssi(CCSR_SSI_SRCR_RXBIT0 | CCSR_SSI_SRCR_RFEN0 |
+ CCSR_SSI_SRCR_RFSI | CCSR_SSI_SRCR_REFS |
+ CCSR_SSI_SRCR_RSCKP, &ssi->srcr);
+ /*
+ * The DC and PM bits are only used if the SSI is the clock master.
+ */
+
+ /*
+ * Set the watermark for transmit FIFI 0 and receive FIFO 0. We don't
+ * use FIFO 1. We program the transmit water to signal a DMA transfer
+ * if there are only two (or fewer) elements left in the FIFO. Two
+ * elements equals one frame (left channel, right channel). This value,
+ * however, depends on the depth of the transmit buffer.
+ *
+ * We set the watermark on the same level as the DMA burstsize. For
+ * fiq it is probably better to use the biggest possible watermark
+ * size.
+ */
+ if (ssi_private->use_dma)
+ wm = ssi_private->fifo_depth - 2;
+ else
+ wm = ssi_private->fifo_depth;
+
+ write_ssi(CCSR_SSI_SFCSR_TFWM0(wm) | CCSR_SSI_SFCSR_RFWM0(wm) |
+ CCSR_SSI_SFCSR_TFWM1(wm) | CCSR_SSI_SFCSR_RFWM1(wm),
+ &ssi->sfcsr);
+
+ /*
+ * For non-ac97 setups, we keep the SSI disabled because if we enable
+ * it, then the DMA controller will start. It's not supposed to start
+ * until the SCR.TE (or SCR.RE) bit is set, but it does anyway. The DMA
+ * controller will transfer one "BWC" of data (i.e. the amount of data
+ * that the MR.BWC bits are set to). The reason this is bad is because
+ * at this point, the PCM driver has not finished initializing the DMA
+ * controller.
+ */
+
+
+ /*
+ * For ac97 interrupts are enabled with the startup of the substream
+ * because it is also running without an active substream. Normally SSI
+ * is only enabled when there is a substream.
+ */
+ if (!ssi_private->imx_ac97) {
+ /* Enable the interrupts and DMA requests */
+ if (ssi_private->use_dma)
+ write_ssi(SIER_FLAGS, &ssi->sier);
+ else
+ write_ssi(CCSR_SSI_SIER_TIE | CCSR_SSI_SIER_TFE0_EN |
+ CCSR_SSI_SIER_RIE |
+ CCSR_SSI_SIER_RFF0_EN, &ssi->sier);
+ } else {
+ /*
+ * Setup the clock control register
+ */
+ write_ssi(CCSR_SSI_SxCCR_WL(17) | CCSR_SSI_SxCCR_DC(13),
+ &ssi->stccr);
+ write_ssi(CCSR_SSI_SxCCR_WL(17) | CCSR_SSI_SxCCR_DC(13),
+ &ssi->srccr);
+
+ /*
+ * Enable AC97 mode and startup the SSI
+ */
+ write_ssi(CCSR_SSI_SACNT_AC97EN | CCSR_SSI_SACNT_FV,
+ &ssi->sacnt);
+ write_ssi(0xff, &ssi->saccdis);
+ write_ssi(0x300, &ssi->saccen);
+
+ /*
+ * Enable SSI
+ */
+ write_ssi_mask(&ssi->scr, 0, CCSR_SSI_SCR_SSIEN);
+ write_ssi(CCSR_SSI_SOR_WAIT(3), &ssi->sor);
+
+ /*
+ * Enable Transmit and Receive
+ */
+ write_ssi_mask(&ssi->scr, 0, CCSR_SSI_SCR_TE | CCSR_SSI_SCR_RE);
+ }
+
+ return 0;
+}
+
+
/**
* fsl_ssi_startup: create a new substream
*
@@ -341,75 +460,14 @@ static int fsl_ssi_startup(struct snd_pcm_substream *substream,
* and initialize the SSI registers.
*/
if (!ssi_private->first_stream) {
- struct ccsr_ssi __iomem *ssi = ssi_private->ssi;
-
ssi_private->first_stream = substream;
/*
- * Section 16.5 of the MPC8610 reference manual says that the
- * SSI needs to be disabled before updating the registers we set
- * here.
- */
- write_ssi_mask(&ssi->scr, CCSR_SSI_SCR_SSIEN, 0);
-
- /*
- * Program the SSI into I2S Slave Non-Network Synchronous mode.
- * Also enable the transmit and receive FIFO.
- *
- * FIXME: Little-endian samples require a different shift dir
- */
- write_ssi_mask(&ssi->scr,
- CCSR_SSI_SCR_I2S_MODE_MASK | CCSR_SSI_SCR_SYN,
- CCSR_SSI_SCR_TFR_CLK_DIS | CCSR_SSI_SCR_I2S_MODE_SLAVE
- | (synchronous ? CCSR_SSI_SCR_SYN : 0));
-
- write_ssi(CCSR_SSI_STCR_TXBIT0 | CCSR_SSI_STCR_TFEN0 |
- CCSR_SSI_STCR_TFSI | CCSR_SSI_STCR_TEFS |
- CCSR_SSI_STCR_TSCKP, &ssi->stcr);
-
- write_ssi(CCSR_SSI_SRCR_RXBIT0 | CCSR_SSI_SRCR_RFEN0 |
- CCSR_SSI_SRCR_RFSI | CCSR_SSI_SRCR_REFS |
- CCSR_SSI_SRCR_RSCKP, &ssi->srcr);
-
- /*
- * The DC and PM bits are only used if the SSI is the clock
- * master.
- */
-
- /* Enable the interrupts and DMA requests */
- if (ssi_private->use_dma)
- write_ssi(SIER_FLAGS, &ssi->sier);
- else
- write_ssi(CCSR_SSI_SIER_TIE | CCSR_SSI_SIER_TFE0_EN |
- CCSR_SSI_SIER_RIE |
- CCSR_SSI_SIER_RFF0_EN, &ssi->sier);
-
- /*
- * Set the watermark for transmit FIFI 0 and receive FIFO 0. We
- * don't use FIFO 1. We program the transmit water to signal a
- * DMA transfer if there are only two (or fewer) elements left
- * in the FIFO. Two elements equals one frame (left channel,
- * right channel). This value, however, depends on the depth of
- * the transmit buffer.
- *
- * We program the receive FIFO to notify us if at least two
- * elements (one frame) have been written to the FIFO. We could
- * make this value larger (and maybe we should), but this way
- * data will be written to memory as soon as it's available.
- */
- write_ssi(CCSR_SSI_SFCSR_TFWM0(ssi_private->fifo_depth - 2) |
- CCSR_SSI_SFCSR_RFWM0(ssi_private->fifo_depth - 2),
- &ssi->sfcsr);
-
- /*
- * We keep the SSI disabled because if we enable it, then the
- * DMA controller will start. It's not supposed to start until
- * the SCR.TE (or SCR.RE) bit is set, but it does anyway. The
- * DMA controller will transfer one "BWC" of data (i.e. the
- * amount of data that the MR.BWC bits are set to). The reason
- * this is bad is because at this point, the PCM driver has not
- * finished initializing the DMA controller.
+ * fsl_ssi_setup was already called by ac97_init earlier if
+ * the driver is in ac97 mode.
*/
+ if (!ssi_private->imx_ac97)
+ fsl_ssi_setup(ssi_private);
} else {
if (synchronous) {
struct snd_pcm_runtime *first_runtime =
@@ -564,8 +622,9 @@ static void fsl_ssi_shutdown(struct snd_pcm_substream *substream,
/*
* If this is the last active substream, disable the SSI.
+ * If AC97 is active, we don't want to disable SSI.
*/
- if (!ssi_private->first_stream) {
+ if (!ssi_private->first_stream && !ssi_private->imx_ac97) {
struct ccsr_ssi __iomem *ssi = ssi_private->ssi;
write_ssi_mask(&ssi->scr, CCSR_SSI_SCR_SSIEN, 0);
@@ -614,6 +673,130 @@ static const struct snd_soc_component_driver fsl_ssi_component = {
.name = "fsl-ssi",
};
+/**
+ * fsl_ssi_ac97_trigger: start and stop the AC97 receive/transmit.
+ *
+ * This function is called by ALSA to start, stop, pause, and resume the
+ * transfer of data.
+ */
+static int fsl_ssi_ac97_trigger(struct snd_pcm_substream *substream, int cmd,
+ struct snd_soc_dai *dai)
+{
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
+ struct fsl_ssi_private *ssi_private = snd_soc_dai_get_drvdata(
+ rtd->cpu_dai);
+ struct ccsr_ssi __iomem *ssi = ssi_private->ssi;
+
+ switch (cmd) {
+ case SNDRV_PCM_TRIGGER_START:
+ case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+ write_ssi_mask(&ssi->sier, 0, CCSR_SSI_SIER_TIE |
+ CCSR_SSI_SIER_TFE0_EN);
+ else
+ write_ssi_mask(&ssi->sier, 0, CCSR_SSI_SIER_RIE |
+ CCSR_SSI_SIER_RFF0_EN);
+ break;
+
+ case SNDRV_PCM_TRIGGER_STOP:
+ case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+ write_ssi_mask(&ssi->sier, CCSR_SSI_SIER_TIE |
+ CCSR_SSI_SIER_TFE0_EN, 0);
+ else
+ write_ssi_mask(&ssi->sier, CCSR_SSI_SIER_RIE |
+ CCSR_SSI_SIER_RFF0_EN, 0);
+ break;
+
+ default:
+ return -EINVAL;
+ }
+
+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+ write_ssi(CCSR_SSI_SOR_TX_CLR, &ssi->sor);
+ else
+ write_ssi(CCSR_SSI_SOR_RX_CLR, &ssi->sor);
+
+ return 0;
+}
+
+static const struct snd_soc_dai_ops fsl_ssi_ac97_dai_ops = {
+ .startup = fsl_ssi_startup,
+ .shutdown = fsl_ssi_shutdown,
+ .trigger = fsl_ssi_ac97_trigger,
+};
+
+static struct snd_soc_dai_driver fsl_ssi_ac97_dai = {
+ .ac97_control = 1,
+ .playback = {
+ .stream_name = "AC97 Playback",
+ .channels_min = 2,
+ .channels_max = 2,
+ .rates = SNDRV_PCM_RATE_8000_48000,
+ .formats = SNDRV_PCM_FMTBIT_S16_LE,
+ },
+ .capture = {
+ .stream_name = "AC97 Capture",
+ .channels_min = 2,
+ .channels_max = 2,
+ .rates = SNDRV_PCM_RATE_48000,
+ .formats = SNDRV_PCM_FMTBIT_S16_LE,
+ },
+ .ops = &fsl_ssi_ac97_dai_ops,
+};
+
+
+static struct fsl_ssi_private *fsl_ac97_data;
+
+static void fsl_ssi_ac97_init(void)
+{
+ fsl_ssi_setup(fsl_ac97_data);
+}
+
+void fsl_ssi_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
+ unsigned short val)
+{
+ struct ccsr_ssi *ssi = fsl_ac97_data->ssi;
+ unsigned int lreg;
+ unsigned int lval;
+
+ if (reg > 0x7f)
+ return;
+
+
+ lreg = reg << 12;
+ write_ssi(lreg, &ssi->sacadd);
+
+ lval = val << 4;
+ write_ssi(lval , &ssi->sacdat);
+
+ write_ssi_mask(&ssi->sacnt, CCSR_SSI_SACNT_RDWR_MASK,
+ CCSR_SSI_SACNT_WR);
+ udelay(100);
+}
+EXPORT_SYMBOL(fsl_ssi_ac97_write);
+
+unsigned short fsl_ssi_ac97_read(struct snd_ac97 *ac97,
+ unsigned short reg)
+{
+ struct ccsr_ssi *ssi = fsl_ac97_data->ssi;
+
+ unsigned short val = -1;
+ unsigned int lreg;
+
+ lreg = (reg & 0x7f) << 12;
+ write_ssi(lreg, &ssi->sacadd);
+ write_ssi_mask(&ssi->sacnt, CCSR_SSI_SACNT_RDWR_MASK,
+ CCSR_SSI_SACNT_RD);
+
+ udelay(100);
+
+ val = (read_ssi(&ssi->sacdat) >> 4) & 0xffff;
+
+ return val;
+}
+EXPORT_SYMBOL(fsl_ssi_ac97_read);
+
/*
* FIXME: As soon as all boards using imx-ssi AC97 mode are able to use
* fsl-ssi, soc_ac97_ops can be used exclusively in this driver without copying
@@ -622,6 +805,23 @@ static const struct snd_soc_component_driver fsl_ssi_component = {
struct snd_ac97_bus_ops soc_ac97_ops;
EXPORT_SYMBOL_GPL(soc_ac97_ops);
+static struct snd_ac97_bus_ops fsl_ssi_soc_ac97_ops = {
+ .read = fsl_ssi_ac97_read,
+ .write = fsl_ssi_ac97_write,
+};
+
+/*
+ * ac97 reset and warm_reset functions are setup by board specific drivers.
+ * ssi does not have any knowledge about the used board.
+ */
+void fsl_ssi_ac97_set_reset(void (*ac97_reset)(struct snd_ac97 *ac97),
+ void (*ac97_warm_reset)(struct snd_ac97 *ac97))
+{
+ soc_ac97_ops.reset = ac97_reset;
+ soc_ac97_ops.warm_reset = ac97_warm_reset;
+}
+EXPORT_SYMBOL(fsl_ssi_ac97_set_reset);
+
/* Show the statistics of a flag only if its interrupt is enabled. The
* compiler will optimze this code to a no-op if the interrupt is not
* enabled.
@@ -698,6 +898,7 @@ static int fsl_ssi_probe(struct platform_device *pdev)
struct resource res;
char name[64];
bool shared;
+ bool ac97 = false;
/* SSIs that are not connected on the board should have a
* status = "disabled"
@@ -708,7 +909,13 @@ static int fsl_ssi_probe(struct platform_device *pdev)
/* We only support the SSI in "I2S Slave" mode */
sprop = of_get_property(np, "fsl,mode", NULL);
- if (!sprop || strcmp(sprop, "i2s-slave")) {
+ if (!sprop) {
+ dev_err(&pdev->dev, "fsl,mode property is necessary\n");
+ return -EINVAL;
+ }
+ if (!strcmp(sprop, "ac97-slave")) {
+ ac97 = true;
+ } else if (strcmp(sprop, "i2s-slave")) {
dev_notice(&pdev->dev, "mode %s is unsupported\n", sprop);
return -ENODEV;
}
@@ -724,13 +931,23 @@ static int fsl_ssi_probe(struct platform_device *pdev)
strcpy(ssi_private->name, p);
- /* Initialize this copy of the CPU DAI driver structure */
- memcpy(&ssi_private->cpu_dai_drv, &fsl_ssi_dai_template,
- sizeof(fsl_ssi_dai_template));
- ssi_private->cpu_dai_drv.name = ssi_private->name;
-
ssi_private->use_dma = !of_property_read_bool(np, "fsl,imx-fiq");
+ if (ac97) {
+ memcpy(&ssi_private->cpu_dai_drv, &fsl_ssi_ac97_dai,
+ sizeof(fsl_ssi_ac97_dai));
+ memcpy(&soc_ac97_ops, &fsl_ssi_soc_ac97_ops,
+ sizeof(soc_ac97_ops));
+
+ fsl_ac97_data = ssi_private;
+ ssi_private->imx_ac97 = true;
+ } else {
+ /* Initialize this copy of the CPU DAI driver structure */
+ memcpy(&ssi_private->cpu_dai_drv, &fsl_ssi_dai_template,
+ sizeof(fsl_ssi_dai_template));
+ }
+ ssi_private->cpu_dai_drv.name = ssi_private->name;
+
/* Get the addresses and IRQ */
ret = of_address_to_resource(np, 0, &res);
if (ret) {
@@ -910,6 +1127,9 @@ static int fsl_ssi_probe(struct platform_device *pdev)
}
done:
+ if (ssi_private->imx_ac97)
+ fsl_ssi_ac97_init();
+
return 0;
error_dai:
diff --git a/sound/soc/fsl/fsl_ssi.h b/sound/soc/fsl/fsl_ssi.h
index e6b9a69..87004ae 100644
--- a/sound/soc/fsl/fsl_ssi.h
+++ b/sound/soc/fsl/fsl_ssi.h
@@ -206,3 +206,10 @@ struct ccsr_ssi {
#endif
+
+void fsl_ssi_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
+ unsigned short val);
+unsigned short fsl_ssi_ac97_read(struct snd_ac97 *ac97,
+ unsigned short reg);
+void fsl_ssi_ac97_set_reset(void (*ac97_reset)(struct snd_ac97 *ac97),
+ void (*ac97_warm_reset)(struct snd_ac97 *ac97));
--
1.8.2.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v9 07/10] ARM: imx: Export ac97 reset functions
2013-06-20 13:20 ASoC: fsl-ssi: ac97-slave support Markus Pargmann
` (5 preceding siblings ...)
2013-06-20 13:20 ` [PATCH v9 06/10] ASoC: fsl-ssi: imx ac97 support Markus Pargmann
@ 2013-06-20 13:20 ` Markus Pargmann
2013-06-20 13:20 ` [PATCH v9 08/10] ASoC: Add phycore-ac97-dt driver Markus Pargmann
` (2 subsequent siblings)
9 siblings, 0 replies; 26+ messages in thread
From: Markus Pargmann @ 2013-06-20 13:20 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
---
arch/arm/mach-imx/mach-pca100.c | 7 +++++--
arch/arm/mach-imx/mach-pcm043.c | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c
index b8b15bb..68badf8 100644
--- a/arch/arm/mach-imx/mach-pca100.c
+++ b/arch/arm/mach-imx/mach-pca100.c
@@ -22,6 +22,7 @@
#include <linux/i2c.h>
#include <linux/i2c/at24.h>
#include <linux/dma-mapping.h>
+#include <linux/export.h>
#include <linux/spi/spi.h>
#include <linux/spi/eeprom.h>
#include <linux/irq.h>
@@ -208,7 +209,7 @@ static const struct spi_imx_master pca100_spi0_data __initconst = {
.num_chipselect = ARRAY_SIZE(pca100_spi_cs),
};
-static void pca100_ac97_warm_reset(struct snd_ac97 *ac97)
+void pca100_ac97_warm_reset(struct snd_ac97 *ac97)
{
mxc_gpio_mode(GPIO_PORTC | 20 | GPIO_GPIO | GPIO_OUT);
gpio_set_value(GPIO_PORTC + 20, 1);
@@ -217,8 +218,9 @@ static void pca100_ac97_warm_reset(struct snd_ac97 *ac97)
mxc_gpio_mode(PC20_PF_SSI1_FS);
msleep(2);
}
+EXPORT_SYMBOL(pca100_ac97_warm_reset);
-static void pca100_ac97_cold_reset(struct snd_ac97 *ac97)
+void pca100_ac97_cold_reset(struct snd_ac97 *ac97)
{
mxc_gpio_mode(GPIO_PORTC | 20 | GPIO_GPIO | GPIO_OUT); /* FS */
gpio_set_value(GPIO_PORTC + 20, 0);
@@ -232,6 +234,7 @@ static void pca100_ac97_cold_reset(struct snd_ac97 *ac97)
mxc_gpio_mode(PC22_PF_SSI1_TXD);
msleep(2);
}
+EXPORT_SYMBOL(pca100_ac97_cold_reset);
static const struct imx_ssi_platform_data pca100_ssi_pdata __initconst = {
.ac97_reset = pca100_ac97_cold_reset,
diff --git a/arch/arm/mach-imx/mach-pcm043.c b/arch/arm/mach-imx/mach-pcm043.c
index 8ed533f..4f318ca 100644
--- a/arch/arm/mach-imx/mach-pcm043.c
+++ b/arch/arm/mach-imx/mach-pcm043.c
@@ -27,6 +27,7 @@
#include <linux/i2c/at24.h>
#include <linux/usb/otg.h>
#include <linux/usb/ulpi.h>
+#include <linux/export.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@ -217,7 +218,7 @@ static iomux_v3_cfg_t pcm043_pads[] = {
#define SD1_GPIO_WP IMX_GPIO_NR(2, 23)
#define SD1_GPIO_CD IMX_GPIO_NR(2, 24)
-static void pcm043_ac97_warm_reset(struct snd_ac97 *ac97)
+void pcm043_ac97_warm_reset(struct snd_ac97 *ac97)
{
iomux_v3_cfg_t txfs_gpio = MX35_PAD_STXFS4__GPIO2_31;
iomux_v3_cfg_t txfs = MX35_PAD_STXFS4__AUDMUX_AUD4_TXFS;
@@ -239,8 +240,9 @@ static void pcm043_ac97_warm_reset(struct snd_ac97 *ac97)
gpio_free(AC97_GPIO_TXFS);
mxc_iomux_v3_setup_pad(txfs);
}
+EXPORT_SYMBOL(pcm043_ac97_warm_reset);
-static void pcm043_ac97_cold_reset(struct snd_ac97 *ac97)
+void pcm043_ac97_cold_reset(struct snd_ac97 *ac97)
{
iomux_v3_cfg_t txfs_gpio = MX35_PAD_STXFS4__GPIO2_31;
iomux_v3_cfg_t txfs = MX35_PAD_STXFS4__AUDMUX_AUD4_TXFS;
@@ -286,6 +288,7 @@ err1:
printk("%s failed with %d\n", __func__, ret);
mdelay(1);
}
+EXPORT_SYMBOL(pcm043_ac97_cold_reset);
static const struct imx_ssi_platform_data pcm043_ssi_pdata __initconst = {
.ac97_reset = pcm043_ac97_cold_reset,
--
1.8.2.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v9 08/10] ASoC: Add phycore-ac97-dt driver
2013-06-20 13:20 ASoC: fsl-ssi: ac97-slave support Markus Pargmann
` (6 preceding siblings ...)
2013-06-20 13:20 ` [PATCH v9 07/10] ARM: imx: Export ac97 reset functions Markus Pargmann
@ 2013-06-20 13:20 ` Markus Pargmann
2013-07-03 16:17 ` Mark Brown
2013-06-20 13:20 ` [PATCH v9 09/10] ASoC: fsl: Move fsl-ssi binding doc to sound/ Markus Pargmann
2013-06-20 13:20 ` [PATCH v9 10/10] ASoC: fsl: Update fsl-ssi binding doc Markus Pargmann
9 siblings, 1 reply; 26+ messages in thread
From: Markus Pargmann @ 2013-06-20 13:20 UTC (permalink / raw)
To: linux-arm-kernel
Add devicetree support for phycore-ac97 driver in a seperated driver for
DT loading. The seperation reduces the confusion with the old style
initialization of this driver via late_initcall. Also this driver is
using fsl-ssi instead of imx-ssi.
platform_of_node and cpu_of_node are set according to the fsl,audmux
phandle.
This patch adds handling of ac97 reset functions according to fsl ac97
support. They are setup from here to avoid board specific code in the
generic fsl-ssi driver.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
---
Notes:
Changes in v9:
- Fix blank line at end of file.
Changes in v8:
- Seperate DT capable driver from old phycore-ac97. This eliminates a lot of
build issues and makes the driver easier to read.
- fsl_ssi may not be built as module if used with ac97 because it defines
the soc_ac97_ops symbol which is used by the soc ac97 core and codec drivers.
So phycore-ac97-dt actually does not support building as module anymore. The
same issue was existing with imx-ssi and phycore-ac97, which is also fixed
now in this patch.
Changes in v7:
- Declare empty ac97 reset functions static.
- Replace complicated machine compatible comparison with
of_machine_is_compatible
- Missing snd_soc_unregister_card in imx_phycore_ac97_remove
- Rename driver
Changes in v6:
- phycore-ac97 now manages the ac97 reset functions of the boards using
this combination of ssi-codec.
- Removed preprocessor ifs for DT, non-DT distinction. pcm043 is now
non-DT only and pca100 DT only.
Changes in v4:
- New property phytec,audmux to check which audmux setup should be
executed. Checking for fsl,imx21-audmux and fsl,imx31-audmux.
Changes in v3:
- Add some more information in the commit message.
Changes in v2:
- Simplify the driver, by combining audmux port configurations. The
audmux driver actually knows on which platform he is running and
will return the appropriate error code if we use functions for
another platform. So we don't need to have the knowledge about it
in phycore-ac97 and can try both functions. This removes the need
of different compatibilities and renames it to phycore-ac97.
- Use a phandle for the cpu_dai link.
- Add devicetree binding documentation.
- Rename binding to phytec,phycore-ac97 and fsl,ssi to phytec,ssi
.../bindings/sound/phytec,phycore-ac97.txt | 14 ++
sound/soc/fsl/Kconfig | 16 +-
sound/soc/fsl/Makefile | 2 +
sound/soc/fsl/phycore-ac97-dt.c | 242 +++++++++++++++++++++
sound/soc/fsl/phycore-ac97.c | 13 +-
5 files changed, 273 insertions(+), 14 deletions(-)
create mode 100644 Documentation/devicetree/bindings/sound/phytec,phycore-ac97.txt
create mode 100644 sound/soc/fsl/phycore-ac97-dt.c
diff --git a/Documentation/devicetree/bindings/sound/phytec,phycore-ac97.txt b/Documentation/devicetree/bindings/sound/phytec,phycore-ac97.txt
new file mode 100644
index 0000000..41201ff
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/phytec,phycore-ac97.txt
@@ -0,0 +1,14 @@
+Phytec phycore AC97
+
+Required properties:
+- compatible: "phytec,phycore-ac97"
+- phytec,ssi: A phandle to the ssi device that is connected to ac97.
+- phytec,audmux: A phandle to the audmux device.
+
+Example:
+
+sound {
+ compatible = "phytec,phycore-ac97";
+ phytec,ssi = <&ssi1>;
+ phytec,audmux = <&audmux>;
+};
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 74ef96e..dafffd1 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -143,8 +143,8 @@ config SND_SOC_MX27VIS_AIC32X4
board with TLV320AIC32X4 codec.
config SND_SOC_PHYCORE_AC97
- tristate "SoC Audio support for Phytec phyCORE (and phyCARD) boards"
- depends on MACH_PCM043 || MACH_PCA100
+ bool "SoC Audio support for Phytec phyCORE boards"
+ depends on MACH_PCM043
select SND_SOC_AC97_BUS
select SND_SOC_WM9712
select SND_SOC_IMX_PCM_FIQ
@@ -154,6 +154,18 @@ config SND_SOC_PHYCORE_AC97
Say Y if you want to add support for SoC audio on Phytec phyCORE
and phyCARD boards in AC97 mode
+config SND_SOC_PHYCORE_AC97_DT
+ bool "SoC Audio support for Phytec phyCORE (and phyCARD) boards (devicetree only)"
+ depends on MACH_PCA100 || MACH_PCM043
+ select SND_SOC_AC97_BUS
+ select SND_SOC_WM9712
+ select SND_SOC_IMX_PCM_FIQ
+ select SND_SOC_IMX_AUDMUX
+ select SND_SOC_FSL_SSI
+ help
+ Say Y if you want to add support for SoC audio on Phytec phyCORE
+ and phyCARD boards in AC97 mode when using devicetree.
+
config SND_SOC_EUKREA_TLV320
tristate "Eukrea TLV320"
depends on MACH_EUKREA_MBIMX27_BASEBOARD \
diff --git a/sound/soc/fsl/Makefile b/sound/soc/fsl/Makefile
index 91883f8..be9b198 100644
--- a/sound/soc/fsl/Makefile
+++ b/sound/soc/fsl/Makefile
@@ -39,6 +39,7 @@ obj-$(CONFIG_SND_SOC_IMX_PCM_DMA) += imx-pcm-dma.o
# i.MX Machine Support
snd-soc-eukrea-tlv320-objs := eukrea-tlv320.o
snd-soc-phycore-ac97-objs := phycore-ac97.o
+snd-soc-phycore-ac97-dt-objs := phycore-ac97-dt.o
snd-soc-mx27vis-aic32x4-objs := mx27vis-aic32x4.o
snd-soc-wm1133-ev1-objs := wm1133-ev1.o
snd-soc-imx-sgtl5000-objs := imx-sgtl5000.o
@@ -46,6 +47,7 @@ snd-soc-imx-mc13783-objs := imx-mc13783.o
obj-$(CONFIG_SND_SOC_EUKREA_TLV320) += snd-soc-eukrea-tlv320.o
obj-$(CONFIG_SND_SOC_PHYCORE_AC97) += snd-soc-phycore-ac97.o
+obj-$(CONFIG_SND_SOC_PHYCORE_AC97_DT) += snd-soc-phycore-ac97-dt.o
obj-$(CONFIG_SND_SOC_MX27VIS_AIC32X4) += snd-soc-mx27vis-aic32x4.o
obj-$(CONFIG_SND_MXC_SOC_WM1133_EV1) += snd-soc-wm1133-ev1.o
obj-$(CONFIG_SND_SOC_IMX_SGTL5000) += snd-soc-imx-sgtl5000.o
diff --git a/sound/soc/fsl/phycore-ac97-dt.c b/sound/soc/fsl/phycore-ac97-dt.c
new file mode 100644
index 0000000..f494b30
--- /dev/null
+++ b/sound/soc/fsl/phycore-ac97-dt.c
@@ -0,0 +1,242 @@
+/*
+ * phycore-ac97-dt.c -- SoC audio for imx_phycore in AC97 mode
+ *
+ * Copyright 2009 Sascha Hauer, Pengutronix <s.hauer@pengutronix.de>
+ * Copyright 2013 Markus Pargmann, Pengutronix <mpa@pengutronix.de>
+ *
+ * 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/device.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/of.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/soc.h>
+
+#include "imx-audmux.h"
+#include "fsl_ssi.h"
+
+#define DRV_NAME "phycore-ac97-dt-driver"
+
+static struct snd_soc_card imx_phycore;
+static struct device_node *phycore_dai_cpu_node;
+static void (*phycore_ac97_reset) (struct snd_ac97 *ac97);
+static void (*phycore_ac97_warm_reset)(struct snd_ac97 *ac97);
+
+static struct snd_soc_ops imx_phycore_hifi_ops = {
+};
+
+static struct snd_soc_dai_link imx_phycore_dai_ac97[] = {
+ {
+ .name = "HiFi",
+ .stream_name = "HiFi",
+ .codec_dai_name = "wm9712-hifi",
+ .codec_name = "wm9712-codec",
+ .ops = &imx_phycore_hifi_ops,
+ },
+};
+
+static struct snd_soc_card imx_phycore = {
+ .name = "PhyCORE-ac97-audio",
+ .owner = THIS_MODULE,
+ .dai_link = imx_phycore_dai_ac97,
+ .num_links = ARRAY_SIZE(imx_phycore_dai_ac97),
+};
+
+static struct platform_device *imx_phycore_snd_device;
+
+static void phycore_ac97_imx21_audmux(void)
+{
+ imx_audmux_v1_configure_port(MX27_AUDMUX_HPCR1_SSI0,
+ IMX_AUDMUX_V1_PCR_SYN | /* 4wire mode */
+ IMX_AUDMUX_V1_PCR_TFCSEL(3) |
+ IMX_AUDMUX_V1_PCR_TCLKDIR | /* clock is output */
+ IMX_AUDMUX_V1_PCR_RXDSEL(3));
+ imx_audmux_v1_configure_port(3,
+ IMX_AUDMUX_V1_PCR_SYN | /* 4wire mode */
+ IMX_AUDMUX_V1_PCR_TFCSEL(0) |
+ IMX_AUDMUX_V1_PCR_TFSDIR |
+ IMX_AUDMUX_V1_PCR_RXDSEL(0));
+}
+
+static void phycore_ac97_imx31_audmux(void)
+{
+ imx_audmux_v2_configure_port(3,
+ IMX_AUDMUX_V2_PTCR_SYN | /* 4wire mode */
+ IMX_AUDMUX_V2_PTCR_TFSEL(0) |
+ IMX_AUDMUX_V2_PTCR_TFSDIR,
+ IMX_AUDMUX_V2_PDCR_RXDSEL(0));
+ imx_audmux_v2_configure_port(0,
+ IMX_AUDMUX_V2_PTCR_SYN | /* 4wire mode */
+ IMX_AUDMUX_V2_PTCR_TCSEL(3) |
+ IMX_AUDMUX_V2_PTCR_TCLKDIR, /* clock is output */
+ IMX_AUDMUX_V2_PDCR_RXDSEL(3));
+}
+
+static const struct of_device_id imx_phycore_ac97_of_dev_id[] = {
+ {
+ .compatible = "phytec,phycore-ac97",
+ }, {
+ /* sentinel */
+ }
+};
+MODULE_DEVICE_TABLE(of, imx_phycore_ac97_of_dev_id);
+
+
+/*
+ * Pointer to AC97 reset functions for specific boards
+ */
+#if IS_ENABLED(CONFIG_MACH_PCA100)
+extern void pca100_ac97_cold_reset(struct snd_ac97 *ac97);
+extern void pca100_ac97_warm_reset(struct snd_ac97 *ac97);
+#else
+static void pca100_ac97_cold_reset(struct snd_ac97 *ac97) { }
+static void pca100_ac97_warm_reset(struct snd_ac97 *ac97) { }
+#endif
+
+#if IS_ENABLED(CONFIG_MACH_PCM043)
+extern void pcm043_ac97_cold_reset(struct snd_ac97 *ac97);
+extern void pcm043_ac97_warm_reset(struct snd_ac97 *ac97);
+#else
+static void pcm043_ac97_cold_reset(struct snd_ac97 *ac97) { }
+static void pcm043_ac97_warm_reset(struct snd_ac97 *ac97) { }
+#endif
+
+static void phycore_soc_ac97_reset(struct snd_ac97 *ac97)
+{
+ if (phycore_ac97_reset)
+ phycore_ac97_reset(ac97);
+ /* First read sometimes fails, do a dummy read */
+ fsl_ssi_ac97_read(ac97, 0);
+}
+
+static void phycore_soc_ac97_warm_reset(struct snd_ac97 *ac97)
+{
+ if (phycore_ac97_warm_reset)
+ phycore_ac97_warm_reset(ac97);
+
+ /* First read sometimes fails, do a dummy read */
+ fsl_ssi_ac97_read(ac97, 0);
+}
+
+static int phycore_ac97_setup_devices(struct platform_device *pdev)
+{
+ int ret;
+
+ imx_phycore_snd_device = platform_device_alloc("wm9712-codec", -1);
+ if (!imx_phycore_snd_device)
+ return -ENOMEM;
+
+ ret = platform_device_add(imx_phycore_snd_device);
+ if (ret) {
+ dev_err(&pdev->dev, "ASoC: Platform device allocation failed\n");
+ goto fail1;
+ }
+
+ ret = snd_soc_register_card(&imx_phycore);
+ if (ret) {
+ dev_err(&pdev->dev, "ASoC: soc card registration failed\n");
+ goto fail2;
+ }
+ return 0;
+
+fail2:
+ platform_device_del(imx_phycore_snd_device);
+fail1:
+ platform_device_put(imx_phycore_snd_device);
+ return ret;
+}
+
+static int imx_phycore_ac97_probe(struct platform_device *pdev)
+{
+ int ret;
+ struct device_node *ssi_np;
+ struct device_node *audmux_np;
+
+ imx_phycore.dev = &pdev->dev;
+
+ audmux_np = of_parse_phandle(pdev->dev.of_node, "phytec,audmux", 0);
+ if (!audmux_np) {
+ dev_err(&pdev->dev, "Failed to parse phytec,audmux phandle\n");
+ return -EINVAL;
+ }
+
+ if (of_device_is_compatible(audmux_np, "fsl,imx21-audmux")) {
+ phycore_ac97_imx21_audmux();
+ } else if (of_device_is_compatible(audmux_np, "fsl,imx31-audmux")) {
+ phycore_ac97_imx31_audmux();
+ } else {
+ dev_err(&pdev->dev, "Unknown audmux, failed to setup audmux\n");
+ of_node_put(audmux_np);
+ return -EINVAL;
+ }
+ of_node_put(audmux_np);
+
+ ssi_np = of_parse_phandle(pdev->dev.of_node, "phytec,ssi", 0);
+ if (!ssi_np) {
+ dev_err(&pdev->dev, "No valid ssi phandle found\n");
+ return -EINVAL;
+ }
+
+ imx_phycore_dai_ac97[0].cpu_of_node = ssi_np;
+ imx_phycore_dai_ac97[0].platform_of_node = ssi_np;
+ phycore_dai_cpu_node = ssi_np;
+
+ if (of_machine_is_compatible("phytec,imx27-pca100")) {
+ phycore_ac97_reset = pca100_ac97_cold_reset;
+ phycore_ac97_warm_reset = pca100_ac97_warm_reset;
+ } else if (of_machine_is_compatible("phytec,imx35-pcm043")) {
+ phycore_ac97_reset = pcm043_ac97_cold_reset;
+ phycore_ac97_warm_reset = pcm043_ac97_warm_reset;
+ } else {
+ dev_err(&pdev->dev, "Failed to set AC97 reset functions, unknown board.\n");
+ return -EINVAL;
+ }
+
+ fsl_ssi_ac97_set_reset(phycore_soc_ac97_reset,
+ phycore_soc_ac97_warm_reset);
+
+ ret = phycore_ac97_setup_devices(pdev);
+ if (ret)
+ of_node_put(phycore_dai_cpu_node);
+
+ return ret;
+}
+
+static int imx_phycore_ac97_remove(struct platform_device *pdev)
+{
+ of_node_put(phycore_dai_cpu_node);
+ phycore_dai_cpu_node = NULL;
+
+ snd_soc_unregister_card(&imx_phycore);
+
+ platform_device_unregister(imx_phycore_snd_device);
+
+ phycore_ac97_reset = NULL;
+ phycore_ac97_warm_reset = NULL;
+
+ return 0;
+}
+
+static struct platform_driver imx_phycore_ac97_driver = {
+ .probe = imx_phycore_ac97_probe,
+ .remove = imx_phycore_ac97_remove,
+ .driver = {
+ .name = DRV_NAME,
+ .owner = THIS_MODULE,
+ .of_match_table = imx_phycore_ac97_of_dev_id,
+ },
+};
+
+module_platform_driver(imx_phycore_ac97_driver);
+
+MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>");
+MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>");
+MODULE_DESCRIPTION(DRV_NAME ": PhyCORE ALSA SoC DT driver");
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/fsl/phycore-ac97.c b/sound/soc/fsl/phycore-ac97.c
index ae403c2..4126edc 100644
--- a/sound/soc/fsl/phycore-ac97.c
+++ b/sound/soc/fsl/phycore-ac97.c
@@ -52,18 +52,7 @@ static int __init imx_phycore_init(void)
{
int ret;
- if (machine_is_pca100()) {
- imx_audmux_v1_configure_port(MX27_AUDMUX_HPCR1_SSI0,
- IMX_AUDMUX_V1_PCR_SYN | /* 4wire mode */
- IMX_AUDMUX_V1_PCR_TFCSEL(3) |
- IMX_AUDMUX_V1_PCR_TCLKDIR | /* clock is output */
- IMX_AUDMUX_V1_PCR_RXDSEL(3));
- imx_audmux_v1_configure_port(3,
- IMX_AUDMUX_V1_PCR_SYN | /* 4wire mode */
- IMX_AUDMUX_V1_PCR_TFCSEL(0) |
- IMX_AUDMUX_V1_PCR_TFSDIR |
- IMX_AUDMUX_V1_PCR_RXDSEL(0));
- } else if (machine_is_pcm043()) {
+ if (machine_is_pcm043()) {
imx_audmux_v2_configure_port(3,
IMX_AUDMUX_V2_PTCR_SYN | /* 4wire mode */
IMX_AUDMUX_V2_PTCR_TFSEL(0) |
--
1.8.2.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v9 08/10] ASoC: Add phycore-ac97-dt driver
2013-06-20 13:20 ` [PATCH v9 08/10] ASoC: Add phycore-ac97-dt driver Markus Pargmann
@ 2013-07-03 16:17 ` Mark Brown
2013-07-07 7:19 ` Markus Pargmann
0 siblings, 1 reply; 26+ messages in thread
From: Mark Brown @ 2013-07-03 16:17 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jun 20, 2013 at 03:20:27PM +0200, Markus Pargmann wrote:
> Notes:
> Changes in v9:
> - Fix blank line at end of file.
>
Please don't include enormous changelogs like this, they're just noise.
> +config SND_SOC_PHYCORE_AC97_DT
> + bool "SoC Audio support for Phytec phyCORE (and phyCARD) boards (devicetree only)"
> + depends on MACH_PCA100 || MACH_PCM043
Is there an actual dependency on the machine type? This seems wrong for
a DT driver.
> +static struct snd_soc_ops imx_phycore_hifi_ops = {
> +};
> +
You shouldn't have this if there's nothing in it.
> +static struct platform_device *imx_phycore_snd_device;
This shouldn't be a global, it should be in driver data.
> +/*
> + * Pointer to AC97 reset functions for specific boards
> + */
> +#if IS_ENABLED(CONFIG_MACH_PCA100)
> +extern void pca100_ac97_cold_reset(struct snd_ac97 *ac97);
> +extern void pca100_ac97_warm_reset(struct snd_ac97 *ac97);
> +#else
> +static void pca100_ac97_cold_reset(struct snd_ac97 *ac97) { }
> +static void pca100_ac97_warm_reset(struct snd_ac97 *ac97) { }
> +#endif
> + if (of_machine_is_compatible("phytec,imx27-pca100")) {
> + phycore_ac97_reset = pca100_ac97_cold_reset;
> + phycore_ac97_warm_reset = pca100_ac97_warm_reset;
> + } else if (of_machine_is_compatible("phytec,imx35-pcm043")) {
> + phycore_ac97_reset = pcm043_ac97_cold_reset;
> + phycore_ac97_warm_reset = pcm043_ac97_warm_reset;
> + } else {
> + dev_err(&pdev->dev, "Failed to set AC97 reset functions, unknown board.\n");
> + return -EINVAL;
> + }
These functions have no reason to be anywhere except in the driver and
really you should just be specifying which pins to use there - ideally
via pinctrl but I don't think i.MX has adopted that yet.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130703/97fef7f1/attachment.sig>
^ permalink raw reply [flat|nested] 26+ messages in thread* [PATCH v9 08/10] ASoC: Add phycore-ac97-dt driver
2013-07-03 16:17 ` Mark Brown
@ 2013-07-07 7:19 ` Markus Pargmann
2013-07-07 13:16 ` [alsa-devel] " Fabio Estevam
2013-07-08 8:06 ` Mark Brown
0 siblings, 2 replies; 26+ messages in thread
From: Markus Pargmann @ 2013-07-07 7:19 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jul 03, 2013 at 05:17:27PM +0100, Mark Brown wrote:
> On Thu, Jun 20, 2013 at 03:20:27PM +0200, Markus Pargmann wrote:
>
> > Notes:
> > Changes in v9:
> > - Fix blank line at end of file.
> >
>
> Please don't include enormous changelogs like this, they're just noise.
>
> > +config SND_SOC_PHYCORE_AC97_DT
> > + bool "SoC Audio support for Phytec phyCORE (and phyCARD) boards (devicetree only)"
> > + depends on MACH_PCA100 || MACH_PCM043
>
> Is there an actual dependency on the machine type? This seems wrong for
> a DT driver.
No, there is no dependency. Fixed.
>
> > +static struct snd_soc_ops imx_phycore_hifi_ops = {
> > +};
> > +
>
> You shouldn't have this if there's nothing in it.
Removed.
>
> > +static struct platform_device *imx_phycore_snd_device;
>
> This shouldn't be a global, it should be in driver data.
Moved to driver data.
>
> > +/*
> > + * Pointer to AC97 reset functions for specific boards
> > + */
> > +#if IS_ENABLED(CONFIG_MACH_PCA100)
> > +extern void pca100_ac97_cold_reset(struct snd_ac97 *ac97);
> > +extern void pca100_ac97_warm_reset(struct snd_ac97 *ac97);
> > +#else
> > +static void pca100_ac97_cold_reset(struct snd_ac97 *ac97) { }
> > +static void pca100_ac97_warm_reset(struct snd_ac97 *ac97) { }
> > +#endif
>
> > + if (of_machine_is_compatible("phytec,imx27-pca100")) {
> > + phycore_ac97_reset = pca100_ac97_cold_reset;
> > + phycore_ac97_warm_reset = pca100_ac97_warm_reset;
> > + } else if (of_machine_is_compatible("phytec,imx35-pcm043")) {
> > + phycore_ac97_reset = pcm043_ac97_cold_reset;
> > + phycore_ac97_warm_reset = pcm043_ac97_warm_reset;
> > + } else {
> > + dev_err(&pdev->dev, "Failed to set AC97 reset functions, unknown board.\n");
> > + return -EINVAL;
> > + }
>
> These functions have no reason to be anywhere except in the driver and
> really you should just be specifying which pins to use there - ideally
> via pinctrl but I don't think i.MX has adopted that yet.
There are no pinctrl driver for imx27(pca100) or imx35(pcm043). The
iomux/pad configure functions are defined inside mach-imx/ including
their headers. Both reset functions have to configure iomux/pad before
and after using gpio. So I think it's not possible to make the reset
based on the gpio pins without the necessary iomux/pad configuration.
Thanks,
Markus
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 26+ messages in thread* [alsa-devel] [PATCH v9 08/10] ASoC: Add phycore-ac97-dt driver
2013-07-07 7:19 ` Markus Pargmann
@ 2013-07-07 13:16 ` Fabio Estevam
2013-07-08 7:19 ` Markus Pargmann
2013-07-08 8:06 ` Mark Brown
1 sibling, 1 reply; 26+ messages in thread
From: Fabio Estevam @ 2013-07-07 13:16 UTC (permalink / raw)
To: linux-arm-kernel
Hi Markus,
On Sun, Jul 7, 2013 at 4:19 AM, Markus Pargmann <mpa@pengutronix.de> wrote:
> There are no pinctrl driver for imx27(pca100) or imx35(pcm043). The
For mx35 pinctrl driver is at drivers/pinctrl/pinctrl-imx35.c
Regards,
Fabio Estevam
^ permalink raw reply [flat|nested] 26+ messages in thread
* [alsa-devel] [PATCH v9 08/10] ASoC: Add phycore-ac97-dt driver
2013-07-07 13:16 ` [alsa-devel] " Fabio Estevam
@ 2013-07-08 7:19 ` Markus Pargmann
0 siblings, 0 replies; 26+ messages in thread
From: Markus Pargmann @ 2013-07-08 7:19 UTC (permalink / raw)
To: linux-arm-kernel
Hi Fabio,
On Sun, Jul 07, 2013 at 10:16:30AM -0300, Fabio Estevam wrote:
> Hi Markus,
>
> On Sun, Jul 7, 2013 at 4:19 AM, Markus Pargmann <mpa@pengutronix.de> wrote:
>
> > There are no pinctrl driver for imx27(pca100) or imx35(pcm043). The
>
> For mx35 pinctrl driver is at drivers/pinctrl/pinctrl-imx35.c
>
Thank you.
I will create some pinctrl bindings for pcm043. But I am not sure what
to do with pca100 reset functions.
Regards,
Markus
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v9 08/10] ASoC: Add phycore-ac97-dt driver
2013-07-07 7:19 ` Markus Pargmann
2013-07-07 13:16 ` [alsa-devel] " Fabio Estevam
@ 2013-07-08 8:06 ` Mark Brown
1 sibling, 0 replies; 26+ messages in thread
From: Mark Brown @ 2013-07-08 8:06 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Jul 07, 2013 at 09:19:49AM +0200, Markus Pargmann wrote:
> On Wed, Jul 03, 2013 at 05:17:27PM +0100, Mark Brown wrote:
> > > +extern void pca100_ac97_cold_reset(struct snd_ac97 *ac97);
> > > +extern void pca100_ac97_warm_reset(struct snd_ac97 *ac97);
> > > +#else
> > > +static void pca100_ac97_cold_reset(struct snd_ac97 *ac97) { }
> > > +static void pca100_ac97_warm_reset(struct snd_ac97 *ac97) { }
> > These functions have no reason to be anywhere except in the driver and
> > really you should just be specifying which pins to use there - ideally
> > via pinctrl but I don't think i.MX has adopted that yet.
> There are no pinctrl driver for imx27(pca100) or imx35(pcm043). The
> iomux/pad configure functions are defined inside mach-imx/ including
> their headers. Both reset functions have to configure iomux/pad before
> and after using gpio. So I think it's not possible to make the reset
> based on the gpio pins without the necessary iomux/pad configuration.
That all sounds fixable - either make pinctrl available or make the
headers usefully visible. You can see the arch headers in the build
of the entire kernel...
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130708/f61f4aec/attachment.sig>
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v9 09/10] ASoC: fsl: Move fsl-ssi binding doc to sound/
2013-06-20 13:20 ASoC: fsl-ssi: ac97-slave support Markus Pargmann
` (7 preceding siblings ...)
2013-06-20 13:20 ` [PATCH v9 08/10] ASoC: Add phycore-ac97-dt driver Markus Pargmann
@ 2013-06-20 13:20 ` Markus Pargmann
2013-07-03 16:18 ` Mark Brown
2013-06-20 13:20 ` [PATCH v9 10/10] ASoC: fsl: Update fsl-ssi binding doc Markus Pargmann
9 siblings, 1 reply; 26+ messages in thread
From: Markus Pargmann @ 2013-06-20 13:20 UTC (permalink / raw)
To: linux-arm-kernel
fsl-ssi was located in powerpc/fsl/ssi.txt. This is no powerpc specific
device, so it should be moved to sound/ as it connects to differen audio
codecs.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
---
.../devicetree/bindings/{powerpc/fsl/ssi.txt => sound/fsl,ssi.txt} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename Documentation/devicetree/bindings/{powerpc/fsl/ssi.txt => sound/fsl,ssi.txt} (100%)
diff --git a/Documentation/devicetree/bindings/powerpc/fsl/ssi.txt b/Documentation/devicetree/bindings/sound/fsl,ssi.txt
similarity index 100%
rename from Documentation/devicetree/bindings/powerpc/fsl/ssi.txt
rename to Documentation/devicetree/bindings/sound/fsl,ssi.txt
--
1.8.2.1
^ permalink raw reply [flat|nested] 26+ messages in thread* [PATCH v9 10/10] ASoC: fsl: Update fsl-ssi binding doc
2013-06-20 13:20 ASoC: fsl-ssi: ac97-slave support Markus Pargmann
` (8 preceding siblings ...)
2013-06-20 13:20 ` [PATCH v9 09/10] ASoC: fsl: Move fsl-ssi binding doc to sound/ Markus Pargmann
@ 2013-06-20 13:20 ` Markus Pargmann
2013-07-03 16:19 ` Mark Brown
9 siblings, 1 reply; 26+ messages in thread
From: Markus Pargmann @ 2013-06-20 13:20 UTC (permalink / raw)
To: linux-arm-kernel
Update the fsl-ssi bindings. DMA is no required property anymore and
uses the generic DMA bindings. imx-fiq is a new alternative to DMA
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
---
Notes:
Changes in v9:
- Remove space before tab
Changes in v4:
- Add a comment about hardware bugs for imx-pcm-fiq
Changes in v3:
- In previous versions, I removed fsl,playback-dma and capture-dma. But they
are still in use by fsl_dma.c, so I added them again.
Documentation/devicetree/bindings/sound/fsl,ssi.txt | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/Documentation/devicetree/bindings/sound/fsl,ssi.txt b/Documentation/devicetree/bindings/sound/fsl,ssi.txt
index 5ff76c9..cae80d2 100644
--- a/Documentation/devicetree/bindings/sound/fsl,ssi.txt
+++ b/Documentation/devicetree/bindings/sound/fsl,ssi.txt
@@ -43,10 +43,20 @@ Required properties:
together. This would still allow different sample sizes,
but not different sample rates.
+Note that either dmas, dma-names or fsl,imx-fiq are required.
+
Optional properties:
- codec-handle: Phandle to a 'codec' node that defines an audio
codec connected to this SSI. This node is typically
a child of an I2C or other control node.
+- dmas: Generic dma devicetree binding as described in
+ Documentation/devicetree/bindings/dma/dma.txt.
+- dma-names: Two dmas have to be defined, "tx" and "rx", if fsl,imx-fiq
+ is not defined.
+- fsl,imx-fiq: Bool property. Use imx-pcm-fiq instead of imx-pcm-dma.
+ Only necessary for some boards with incompatible
+ codec. imx-pcm-fiq will manually filter some data from
+ the codec. It is a workaround for a hardware bug.
Child 'codec' node required properties:
- compatible: Compatible list, contains the name of the codec
--
1.8.2.1
^ permalink raw reply related [flat|nested] 26+ messages in thread