Re: [alsa-devel] [PATCHv4 00/20] OMAP ASoC changes in DMA utilization
* Mark Brown [090819 11:27]: > On Wed, Aug 19, 2009 at 10:48:35AM +0300, Eduardo Valentin wrote: > > On Wed, Aug 19, 2009 at 09:40:12AM +0200, Valentin Eduardo > > (Nokia-D/Helsinki) wrote: > > > > About these changes. I have one doubt. What is the correct tree to base > > > them? > > > There are changes under arch/arm/plat-omap/ and under sound/soc/omap/. > > ... > > > > Please do not apply this version. Let's define this first, then I send > > > the correct version. > > > There is 1 Jarkko's patch which changes arch/arm/plat-omap/ which is already > > in Takashi's tree, IIRC. > > I believe there's colisons with the OMAP1 stuff too. Might be worth > applying these on a branch and then providing merges into both the ASoC > and OMAP trees? I'm fine with these all going in via the alsa tree. If there are conflicts, let's get those parts into the omap for-next branch first. Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [alsa-devel] [PATCHv4 00/20] OMAP ASoC changes in DMA utilization
On Wed, Aug 19, 2009 at 10:48:35AM +0300, Eduardo Valentin wrote: > On Wed, Aug 19, 2009 at 09:40:12AM +0200, Valentin Eduardo (Nokia-D/Helsinki) > wrote: > > About these changes. I have one doubt. What is the correct tree to base > > them? > > There are changes under arch/arm/plat-omap/ and under sound/soc/omap/. ... > > Please do not apply this version. Let's define this first, then I send > > the correct version. > There is 1 Jarkko's patch which changes arch/arm/plat-omap/ which is already > in Takashi's tree, IIRC. I believe there's colisons with the OMAP1 stuff too. Might be worth applying these on a branch and then providing merges into both the ASoC and OMAP trees? -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCHv4 00/20] OMAP ASoC changes in DMA utilization
On Wed, Aug 19, 2009 at 09:40:12AM +0200, Valentin Eduardo (Nokia-D/Helsinki) wrote: > Hello guys, > > On Mon, Aug 17, 2009 at 04:05:49PM +0200, Jarkko Nikula wrote: > > On Mon, 17 Aug 2009 14:50:59 +0300 > > Eduardo Valentin wrote: > > > > > Hello again guys, > > > > > > Here is version 4 of these changes. No real changes from previous > > > versions. > > > The only thing is that now I've rebased on top of Takashi's tree: > > > http://git.kernel.org/?p=linux/kernel/git/tiwai/sound-2.6.git;a=summary > > > > > > as there are pending things there which Jarkko has pointed on previous > > > series. > > > > > Here's my ack to the ASoC part. I tested the set on top of these > > Janusz's patches: > > > > http://mailman.alsa-project.org/pipermail/alsa-devel/2009-August/020170.html > > http://mailman.alsa-project.org/pipermail/alsa-devel/2009-August/020171.html > > http://mailman.alsa-project.org/pipermail/alsa-devel/2009-August/020262.html > > > > Note, that I posted modified version for the patch 16 based on Janusz's > > [PATCH 3/3 v3]. > > > > Acked-by: Jarkko Nikula > > > > > > > > arch/arm/mach-omap2/mcbsp.c |5 + > > > arch/arm/plat-omap/include/mach/mcbsp.h | 49 > > > arch/arm/plat-omap/mcbsp.c | 377 > > > ++- > > > sound/soc/omap/omap-mcbsp.c | 78 ++- > > > sound/soc/omap/omap-pcm.c | 14 +- > > > sound/soc/omap/omap-pcm.h |2 + > > > 6 files changed, 511 insertions(+), 14 deletions(-) > > > > > Tony, if you are ok with the OMAP McBSP changes, how it would be best > > get these merged? Via ASoC, LKML or separately from both > > subsystems during the merge window? > > Tony, Takashi, > > About these changes. I have one doubt. What is the correct tree to base them? > There are changes under arch/arm/plat-omap/ and under sound/soc/omap/. > > Should I base them: > - all 20 patches against sound-2.6.git tree (Takashi's tree), > - all 20 patches against linux-omap.git tree (Tony's tree), > - make mcbsp part against Tony's tree and asoc part against Takashi's tree > > Please do not apply this version. Let's define this first, then I send > the correct version. There is 1 Jarkko's patch which changes arch/arm/plat-omap/ which is already in Takashi's tree, IIRC. > > BR, > > > > > > > -- > > Jarkko > > -- > Eduardo Valentin -- Eduardo Valentin -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCHv4 00/20] OMAP ASoC changes in DMA utilization
Hello guys, On Mon, Aug 17, 2009 at 04:05:49PM +0200, Jarkko Nikula wrote: > On Mon, 17 Aug 2009 14:50:59 +0300 > Eduardo Valentin wrote: > > > Hello again guys, > > > > Here is version 4 of these changes. No real changes from previous versions. > > The only thing is that now I've rebased on top of Takashi's tree: > > http://git.kernel.org/?p=linux/kernel/git/tiwai/sound-2.6.git;a=summary > > > > as there are pending things there which Jarkko has pointed on previous > > series. > > > Here's my ack to the ASoC part. I tested the set on top of these > Janusz's patches: > > http://mailman.alsa-project.org/pipermail/alsa-devel/2009-August/020170.html > http://mailman.alsa-project.org/pipermail/alsa-devel/2009-August/020171.html > http://mailman.alsa-project.org/pipermail/alsa-devel/2009-August/020262.html > > Note, that I posted modified version for the patch 16 based on Janusz's > [PATCH 3/3 v3]. > > Acked-by: Jarkko Nikula > > > > > arch/arm/mach-omap2/mcbsp.c |5 + > > arch/arm/plat-omap/include/mach/mcbsp.h | 49 > > arch/arm/plat-omap/mcbsp.c | 377 > > ++- > > sound/soc/omap/omap-mcbsp.c | 78 ++- > > sound/soc/omap/omap-pcm.c | 14 +- > > sound/soc/omap/omap-pcm.h |2 + > > 6 files changed, 511 insertions(+), 14 deletions(-) > > > Tony, if you are ok with the OMAP McBSP changes, how it would be best > get these merged? Via ASoC, LKML or separately from both > subsystems during the merge window? Tony, Takashi, About these changes. I have one doubt. What is the correct tree to base them? There are changes under arch/arm/plat-omap/ and under sound/soc/omap/. Should I base them: - all 20 patches against sound-2.6.git tree (Takashi's tree), - all 20 patches against linux-omap.git tree (Tony's tree), - make mcbsp part against Tony's tree and asoc part against Takashi's tree Please do not apply this version. Let's define this first, then I send the correct version. BR, > > > -- > Jarkko -- Eduardo Valentin -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCHv4 00/20] OMAP ASoC changes in DMA utilization
On Mon, 17 Aug 2009 14:50:59 +0300 Eduardo Valentin wrote: > Hello again guys, > > Here is version 4 of these changes. No real changes from previous versions. > The only thing is that now I've rebased on top of Takashi's tree: > http://git.kernel.org/?p=linux/kernel/git/tiwai/sound-2.6.git;a=summary > > as there are pending things there which Jarkko has pointed on previous series. > Here's my ack to the ASoC part. I tested the set on top of these Janusz's patches: http://mailman.alsa-project.org/pipermail/alsa-devel/2009-August/020170.html http://mailman.alsa-project.org/pipermail/alsa-devel/2009-August/020171.html http://mailman.alsa-project.org/pipermail/alsa-devel/2009-August/020262.html Note, that I posted modified version for the patch 16 based on Janusz's [PATCH 3/3 v3]. Acked-by: Jarkko Nikula > > arch/arm/mach-omap2/mcbsp.c |5 + > arch/arm/plat-omap/include/mach/mcbsp.h | 49 > arch/arm/plat-omap/mcbsp.c | 377 > ++- > sound/soc/omap/omap-mcbsp.c | 78 ++- > sound/soc/omap/omap-pcm.c | 14 +- > sound/soc/omap/omap-pcm.h |2 + > 6 files changed, 511 insertions(+), 14 deletions(-) > Tony, if you are ok with the OMAP McBSP changes, how it would be best get these merged? Via ASoC, LKML or separately from both subsystems during the merge window? -- Jarkko -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCHv4 00/20] OMAP ASoC changes in DMA utilization
Hello again guys, Here is version 4 of these changes. No real changes from previous versions. The only thing is that now I've rebased on top of Takashi's tree: http://git.kernel.org/?p=linux/kernel/git/tiwai/sound-2.6.git;a=summary as there are pending things there which Jarkko has pointed on previous series. BR, Eduardo Valentin (11): OMAP: McBSP: Add IRQEN, IRQSTATUS, THRESHOLD2 and THRESHOLD1 registers. OMAP: McBSP: Use appropriate value for startup delay OMAP: McBSP: Add transmit/receive threshold handler OMAP: McBSP: Create and export max_(r|t)x_thres property OMAP: McBSP: Rename thres sysfs symbols OMAP: McBSP: Change wakeup signals OMAP: McBSP: Configure NO IDLE mode for DMA mode different of threshold ASoC: OMAP: Make DMA 64 aligned ASoC: OMAP: Enable DMA burst mode ASoC: OMAP: Use McBSP threshold to playback and capture ASoC: OMAP: Use DMA operating mode of McBSP Eero Nurkkala (7): OMAP: McBSP: Provide functions for ASoC frame syncronization OMAP: McBSP: Wakeups utilized OMAP: McBSP: Retain McBSP FCLK clockactivity OMAP: McBSP: Do not enable wakeups for no-idle mode OMAP: McBSP: Let element DMA mode hit retention also ASoC: Add runtime check for RFIG and XFIG ASoC: Always syncronize audio transfers on frames Peter Ujfalusi (2): OMAP3: McBSP: Lower the maximum buffersize for McBSP1,3,4,5 OMAP: McBSP: Add link DMA mode selection arch/arm/mach-omap2/mcbsp.c |5 + arch/arm/plat-omap/include/mach/mcbsp.h | 49 arch/arm/plat-omap/mcbsp.c | 377 ++- sound/soc/omap/omap-mcbsp.c | 78 ++- sound/soc/omap/omap-pcm.c | 14 +- sound/soc/omap/omap-pcm.h |2 + 6 files changed, 511 insertions(+), 14 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html