Re: [PATCH 0/2] Convert davinci ASoC to genalloc SRAM
On 10.10.2012 11:59, Kumar, Anil wrote: > On Wed, Oct 10, 2012 at 12:34:47, Daniel Mack wrote: >> On 10.10.2012 08:54, Kumar, Anil wrote: >>> On Thu, Oct 04, 2012 at 15:45:43, Porter, Matt wrote: This series converts davinci ASoC to use genalloc and enables that support on DA850. It applies on top of the uio_pruss/genalloc series [1] which allows DaVinci to provide a gen_pool via pdata for driver use. I've tested this on the AM180x EVM. Note that prior to this, the SRAM paths in the driver were completely unused. I've only enabled ping-pong buffering on the platform I can test as it's best to allow those with DM644x and similar platforms to set the playback/capture sram size to something that's known to work for them. [1] http://www.spinics.net/lists/arm-kernel/msg198854.html >>> >>> Tested on DA850 EVM after applying patches from [1] above. >>> Tested on Linux-torvalds 3.6-rc6 master branch. >>> Tested ASoC module (aplay & arecord for various frequencies) >>> >>> Acked-by: Kumar, Anil >> >> As you're on it, could you also quickly merge this branch >> >> git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git >> topic/davinci >> >> And see if my recent patches for more McASP flexibility cause any >> trouble on your hardware? >> >> >> Daniel >> >> > > I have merged it with 3.6-rc6 and I have got error at compile time. > I have fixed this locally with the following patch [1]. > Kindly confirm if the patch is correct? I did the same thing locally, but I considered this a merge conflict. > With that > Tested on DA850 EVM > Tested on Linux-torvalds 3.6-rc6 master branch merged + [1] > Tested ASoC module (aplay & arecord for various frequencies) > > Tested-By: Kumar, Anil Ok, that's good to hear. Thanks a lot :) Daniel > diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h > index 09da4e5..9c02a45 100644 > --- a/include/linux/dmaengine.h > +++ b/include/linux/dmaengine.h > @@ -591,7 +591,7 @@ struct dma_device { > struct dma_async_tx_descriptor *(*device_prep_dma_cyclic)( > struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len, > size_t period_len, enum dma_transfer_direction direction, > - unsigned long flags, void *context); > + void *context); > struct dma_async_tx_descriptor *(*device_prep_interleaved_dma)( > struct dma_chan *chan, struct dma_interleaved_template *xt, > unsigned long flags); > @@ -656,7 +656,7 @@ static inline struct dma_async_tx_descriptor > *dmaengine_prep_dma_cyclic( > size_t period_len, enum dma_transfer_direction dir) > { > return chan->device->device_prep_dma_cyclic(chan, buf_addr, buf_len, > - period_len, dir, flags, NULL); > + period_len, dir, NULL); > } > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
RE: [PATCH 0/2] Convert davinci ASoC to genalloc SRAM
On Wed, Oct 10, 2012 at 12:34:47, Daniel Mack wrote: > On 10.10.2012 08:54, Kumar, Anil wrote: > > On Thu, Oct 04, 2012 at 15:45:43, Porter, Matt wrote: > >> This series converts davinci ASoC to use genalloc and enables > >> that support on DA850. It applies on top of the uio_pruss/genalloc > >> series [1] which allows DaVinci to provide a gen_pool via pdata > >> for driver use. > >> > >> I've tested this on the AM180x EVM. Note that prior to this, > >> the SRAM paths in the driver were completely unused. I've only > >> enabled ping-pong buffering on the platform I can test as it's > >> best to allow those with DM644x and similar platforms to set the > >> playback/capture sram size to something that's known to work > >> for them. > >> > >> [1] http://www.spinics.net/lists/arm-kernel/msg198854.html > > > > Tested on DA850 EVM after applying patches from [1] above. > > Tested on Linux-torvalds 3.6-rc6 master branch. > > Tested ASoC module (aplay & arecord for various frequencies) > > > > Acked-by: Kumar, Anil > > As you're on it, could you also quickly merge this branch > > git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git > topic/davinci > > And see if my recent patches for more McASP flexibility cause any > trouble on your hardware? > > > Daniel > > I have merged it with 3.6-rc6 and I have got error at compile time. I have fixed this locally with the following patch [1]. Kindly confirm if the patch is correct? With that Tested on DA850 EVM Tested on Linux-torvalds 3.6-rc6 master branch merged + [1] Tested ASoC module (aplay & arecord for various frequencies) Tested-By: Kumar, Anil [1] git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/davinci. [2] patch diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index 09da4e5..9c02a45 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -591,7 +591,7 @@ struct dma_device { struct dma_async_tx_descriptor *(*device_prep_dma_cyclic)( struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len, size_t period_len, enum dma_transfer_direction direction, - unsigned long flags, void *context); + void *context); struct dma_async_tx_descriptor *(*device_prep_interleaved_dma)( struct dma_chan *chan, struct dma_interleaved_template *xt, unsigned long flags); @@ -656,7 +656,7 @@ static inline struct dma_async_tx_descriptor *dmaengine_prep_dma_cyclic( size_t period_len, enum dma_transfer_direction dir) { return chan->device->device_prep_dma_cyclic(chan, buf_addr, buf_len, - period_len, dir, flags, NULL); + period_len, dir, NULL); } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 0/2] Convert davinci ASoC to genalloc SRAM
On 10.10.2012 08:54, Kumar, Anil wrote: > On Thu, Oct 04, 2012 at 15:45:43, Porter, Matt wrote: >> This series converts davinci ASoC to use genalloc and enables >> that support on DA850. It applies on top of the uio_pruss/genalloc >> series [1] which allows DaVinci to provide a gen_pool via pdata >> for driver use. >> >> I've tested this on the AM180x EVM. Note that prior to this, >> the SRAM paths in the driver were completely unused. I've only >> enabled ping-pong buffering on the platform I can test as it's >> best to allow those with DM644x and similar platforms to set the >> playback/capture sram size to something that's known to work >> for them. >> >> [1] http://www.spinics.net/lists/arm-kernel/msg198854.html > > Tested on DA850 EVM after applying patches from [1] above. > Tested on Linux-torvalds 3.6-rc6 master branch. > Tested ASoC module (aplay & arecord for various frequencies) > > Acked-by: Kumar, Anil As you're on it, could you also quickly merge this branch git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/davinci And see if my recent patches for more McASP flexibility cause any trouble on your hardware? Daniel -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
RE: [PATCH 0/2] Convert davinci ASoC to genalloc SRAM
On Thu, Oct 04, 2012 at 15:45:43, Porter, Matt wrote: > This series converts davinci ASoC to use genalloc and enables > that support on DA850. It applies on top of the uio_pruss/genalloc > series [1] which allows DaVinci to provide a gen_pool via pdata > for driver use. > > I've tested this on the AM180x EVM. Note that prior to this, > the SRAM paths in the driver were completely unused. I've only > enabled ping-pong buffering on the platform I can test as it's > best to allow those with DM644x and similar platforms to set the > playback/capture sram size to something that's known to work > for them. > > [1] http://www.spinics.net/lists/arm-kernel/msg198854.html Tested on DA850 EVM after applying patches from [1] above. Tested on Linux-torvalds 3.6-rc6 master branch. Tested ASoC module (aplay & arecord for various frequencies) Acked-by: Kumar, Anil > Matt Porter (2): > ASoC: davinci: replace private sram api with genalloc > ARM: davinci: enable SRAM ping ping buffering on DA850 > > arch/arm/mach-davinci/board-da850-evm.c | 24 ++-- > include/linux/platform_data/davinci_asp.h |3 +++ > sound/soc/davinci/davinci-mcasp.c |2 ++ > sound/soc/davinci/davinci-pcm.c | 18 -- > sound/soc/davinci/davinci-pcm.h |2 ++ > 5 files changed, 33 insertions(+), 16 deletions(-) > > -- > 1.7.9.5 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majord...@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 0/2] Convert davinci ASoC to genalloc SRAM
On Thu, Oct 04, 2012 at 06:15:43AM -0400, Matt Porter wrote: > This series converts davinci ASoC to use genalloc and enables > that support on DA850. It applies on top of the uio_pruss/genalloc > series [1] which allows DaVinci to provide a gen_pool via pdata > for driver use. > > I've tested this on the AM180x EVM. Note that prior to this, > the SRAM paths in the driver were completely unused. I've only > enabled ping-pong buffering on the platform I can test as it's > best to allow those with DM644x and similar platforms to set the > playback/capture sram size to something that's known to work > for them. > > [1] http://www.spinics.net/lists/arm-kernel/msg198854.html Tested again on top of v4 of the uio_pruss/genalloc series http://www.spinics.net/lists/arm-kernel/msg199255.html on next-20121005 since there's some conflicts falling out of of arm-soc and asoc/sound header move patches on mainline atm. -Matt -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/