* [PATCH 0/2] OMAP4: McBSP: ASoC: Fix FIFO configuration
@ 2011-12-15 9:32 Peter Ujfalusi
2011-12-15 9:32 ` [PATCH 1/2] OMAP4: mcbsp: Enable FIFO usage Peter Ujfalusi
2011-12-15 9:32 ` [PATCH 2/2] ASoC: omap-mcbsp: Enable FIFO usage on OMAP4 Peter Ujfalusi
0 siblings, 2 replies; 6+ messages in thread
From: Peter Ujfalusi @ 2011-12-15 9:32 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown, Tony Lindgren
Cc: Jarkko Nikula, alsa-devel, linux-omap
Hello,
All McBSP ports in OMAP4 has 128 word long FIFO which is not taken into account.
Fix the configuration so we can configure the FIFO for McBSP in OMAP4.
Regards,
Peter
---
Peter Ujfalusi (2):
OMAP4: mcbsp: Enable FIFO usage
ASoC: omap-mcbsp: Enable FIFO usage on OMAP4
arch/arm/mach-omap2/mcbsp.c | 3 +++
sound/soc/omap/omap-mcbsp.c | 2 +-
2 files changed, 4 insertions(+), 1 deletions(-)
--
1.7.8
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] OMAP4: mcbsp: Enable FIFO usage
2011-12-15 9:32 [PATCH 0/2] OMAP4: McBSP: ASoC: Fix FIFO configuration Peter Ujfalusi
@ 2011-12-15 9:32 ` Peter Ujfalusi
2011-12-16 17:36 ` Tony Lindgren
2011-12-17 9:24 ` Mark Brown
2011-12-15 9:32 ` [PATCH 2/2] ASoC: omap-mcbsp: Enable FIFO usage on OMAP4 Peter Ujfalusi
1 sibling, 2 replies; 6+ messages in thread
From: Peter Ujfalusi @ 2011-12-15 9:32 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown, Tony Lindgren
Cc: Jarkko Nikula, alsa-devel, linux-omap
All McBSP instances on OMAP4 has 128 word long FIFO
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
arch/arm/mach-omap2/mcbsp.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c
index 292eee3..857860b 100644
--- a/arch/arm/mach-omap2/mcbsp.c
+++ b/arch/arm/mach-omap2/mcbsp.c
@@ -153,6 +153,9 @@ static int omap_init_mcbsp(struct omap_hwmod *oh, void *unused)
else
/* The FIFO has 128 locations */
pdata->buffer_size = 0x80;
+ } else if (oh->class->rev == MCBSP_CONFIG_TYPE4) {
+ /* The FIFO has 128 locations for all instances */
+ pdata->buffer_size = 0x80;
}
if (oh->class->rev >= MCBSP_CONFIG_TYPE3)
--
1.7.8
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] ASoC: omap-mcbsp: Enable FIFO usage on OMAP4
2011-12-15 9:32 [PATCH 0/2] OMAP4: McBSP: ASoC: Fix FIFO configuration Peter Ujfalusi
2011-12-15 9:32 ` [PATCH 1/2] OMAP4: mcbsp: Enable FIFO usage Peter Ujfalusi
@ 2011-12-15 9:32 ` Peter Ujfalusi
2011-12-17 9:32 ` Mark Brown
1 sibling, 1 reply; 6+ messages in thread
From: Peter Ujfalusi @ 2011-12-15 9:32 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown, Tony Lindgren
Cc: Jarkko Nikula, alsa-devel, linux-omap
Allow McBSP FIFO configuration from ASoC dai driver
on OMAP4 platform.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
sound/soc/omap/omap-mcbsp.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index bd11d25..0173719 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -258,7 +258,7 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
default:
return -EINVAL;
}
- if (cpu_is_omap34xx()) {
+ if (cpu_is_omap34xx() || cpu_is_omap44xx()) {
dma_data->set_threshold = omap_mcbsp_set_threshold;
/* TODO: Currently, MODE_ELEMENT == MODE_FRAME */
if (omap_mcbsp_get_dma_op_mode(bus_id) ==
--
1.7.8
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] OMAP4: mcbsp: Enable FIFO usage
2011-12-15 9:32 ` [PATCH 1/2] OMAP4: mcbsp: Enable FIFO usage Peter Ujfalusi
@ 2011-12-16 17:36 ` Tony Lindgren
2011-12-17 9:24 ` Mark Brown
1 sibling, 0 replies; 6+ messages in thread
From: Tony Lindgren @ 2011-12-16 17:36 UTC (permalink / raw)
To: Peter Ujfalusi
Cc: Liam Girdwood, Mark Brown, Jarkko Nikula, alsa-devel, linux-omap
* Peter Ujfalusi <peter.ujfalusi@ti.com> [111215 01:01]:
> All McBSP instances on OMAP4 has 128 word long FIFO
>
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Please merge via ASoC tree:
Acked-by: Tony Lindgren <tony@atomide.com>
> ---
> arch/arm/mach-omap2/mcbsp.c | 3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c
> index 292eee3..857860b 100644
> --- a/arch/arm/mach-omap2/mcbsp.c
> +++ b/arch/arm/mach-omap2/mcbsp.c
> @@ -153,6 +153,9 @@ static int omap_init_mcbsp(struct omap_hwmod *oh, void *unused)
> else
> /* The FIFO has 128 locations */
> pdata->buffer_size = 0x80;
> + } else if (oh->class->rev == MCBSP_CONFIG_TYPE4) {
> + /* The FIFO has 128 locations for all instances */
> + pdata->buffer_size = 0x80;
> }
>
> if (oh->class->rev >= MCBSP_CONFIG_TYPE3)
> --
> 1.7.8
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] OMAP4: mcbsp: Enable FIFO usage
2011-12-15 9:32 ` [PATCH 1/2] OMAP4: mcbsp: Enable FIFO usage Peter Ujfalusi
2011-12-16 17:36 ` Tony Lindgren
@ 2011-12-17 9:24 ` Mark Brown
1 sibling, 0 replies; 6+ messages in thread
From: Mark Brown @ 2011-12-17 9:24 UTC (permalink / raw)
To: Peter Ujfalusi
Cc: Liam Girdwood, Tony Lindgren, Jarkko Nikula, alsa-devel, linux-omap
On Thu, Dec 15, 2011 at 11:32:26AM +0200, Peter Ujfalusi wrote:
> All McBSP instances on OMAP4 has 128 word long FIFO
>
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] ASoC: omap-mcbsp: Enable FIFO usage on OMAP4
2011-12-15 9:32 ` [PATCH 2/2] ASoC: omap-mcbsp: Enable FIFO usage on OMAP4 Peter Ujfalusi
@ 2011-12-17 9:32 ` Mark Brown
0 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2011-12-17 9:32 UTC (permalink / raw)
To: Peter Ujfalusi
Cc: Liam Girdwood, Tony Lindgren, Jarkko Nikula, alsa-devel, linux-omap
On Thu, Dec 15, 2011 at 11:32:27AM +0200, Peter Ujfalusi wrote:
> Allow McBSP FIFO configuration from ASoC dai driver
> on OMAP4 platform.
Applied, thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-12-17 9:32 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-12-15 9:32 [PATCH 0/2] OMAP4: McBSP: ASoC: Fix FIFO configuration Peter Ujfalusi
2011-12-15 9:32 ` [PATCH 1/2] OMAP4: mcbsp: Enable FIFO usage Peter Ujfalusi
2011-12-16 17:36 ` Tony Lindgren
2011-12-17 9:24 ` Mark Brown
2011-12-15 9:32 ` [PATCH 2/2] ASoC: omap-mcbsp: Enable FIFO usage on OMAP4 Peter Ujfalusi
2011-12-17 9:32 ` Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.