[alsa-devel] [PATCH 0/2] OMAP4: McBSP: ASoC: Fix FIFO configuration
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(-)
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)
* 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
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.
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) ==
participants (3)
-
Mark Brown -
Peter Ujfalusi -
Tony Lindgren