* [Patches_v2] Reforming S3C I2S towards supporting I2Sv4
@ 2010-04-27 6:54 Jassi Brar
2010-04-27 9:23 ` Liam Girdwood
2010-05-04 0:53 ` Ben Dooks
0 siblings, 2 replies; 6+ messages in thread
From: Jassi Brar @ 2010-04-27 6:54 UTC (permalink / raw)
To: alsa-devel; +Cc: broonie, Jassi Brar, ben-linux, lrg
I am going to resubmit pending last 11 patches of the original series
http://mailman.alsa-project.org/pipermail/alsa-devel/2010-March/025920.html
No changes have been made other than moving dma_data from snd_soc_dai to
snd_soc_pcm_stream in the new I2Sv4 controller driver.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Patches_v2] Reforming S3C I2S towards supporting I2Sv4
2010-04-27 6:54 [Patches_v2] Reforming S3C I2S towards supporting I2Sv4 Jassi Brar
@ 2010-04-27 9:23 ` Liam Girdwood
2010-05-04 0:53 ` Ben Dooks
1 sibling, 0 replies; 6+ messages in thread
From: Liam Girdwood @ 2010-04-27 9:23 UTC (permalink / raw)
To: Jassi Brar; +Cc: alsa-devel, broonie, ben-linux
On Tue, 2010-04-27 at 15:54 +0900, Jassi Brar wrote:
> I am going to resubmit pending last 11 patches of the original series
> http://mailman.alsa-project.org/pipermail/alsa-devel/2010-March/025920.html
> No changes have been made other than moving dma_data from snd_soc_dai to
> snd_soc_pcm_stream in the new I2Sv4 controller driver.
All Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
--
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Patches_v2] Reforming S3C I2S towards supporting I2Sv4
2010-04-27 6:54 [Patches_v2] Reforming S3C I2S towards supporting I2Sv4 Jassi Brar
2010-04-27 9:23 ` Liam Girdwood
@ 2010-05-04 0:53 ` Ben Dooks
2010-05-05 14:00 ` Mark Brown
1 sibling, 1 reply; 6+ messages in thread
From: Ben Dooks @ 2010-05-04 0:53 UTC (permalink / raw)
To: Jassi Brar; +Cc: alsa-devel, broonie, ben-linux, lrg
On Tue, Apr 27, 2010 at 03:54:54PM +0900, Jassi Brar wrote:
> I am going to resubmit pending last 11 patches of the original series
> http://mailman.alsa-project.org/pipermail/alsa-devel/2010-March/025920.html
> No changes have been made other than moving dma_data from snd_soc_dai to
> snd_soc_pcm_stream in the new I2Sv4 controller driver.
All these look fine.
Acked-by: Ben Dooks <ben-linux@fluff.org>
It should also be ok to merge the s3c2412 DMA updates via the same
tree as there's not any intention to be touching this part of the tree
before the next merge.
--
Ben
Q: What's a light-year?
A: One-third less calories than a regular year.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Patches_v2] Reforming S3C I2S towards supporting I2Sv4
2010-05-04 0:53 ` Ben Dooks
@ 2010-05-05 14:00 ` Mark Brown
2010-05-07 1:21 ` [PATCH] ARM: S3C2412: DMA: Remove I2S FIFO address Jassi Brar
0 siblings, 1 reply; 6+ messages in thread
From: Mark Brown @ 2010-05-05 14:00 UTC (permalink / raw)
To: Ben Dooks; +Cc: alsa-devel, Jassi Brar, lrg
On Tue, May 04, 2010 at 01:53:19AM +0100, Ben Dooks wrote:
> On Tue, Apr 27, 2010 at 03:54:54PM +0900, Jassi Brar wrote:
> > I am going to resubmit pending last 11 patches of the original series
> > http://mailman.alsa-project.org/pipermail/alsa-devel/2010-March/025920.html
> > No changes have been made other than moving dma_data from snd_soc_dai to
> > snd_soc_pcm_stream in the new I2Sv4 controller driver.
> All these look fine.
> Acked-by: Ben Dooks <ben-linux@fluff.org>
Now we've got all the relevant acks I tried to apply these against my
for-2.6.35 branch but it looks like there's been some drift somewhere
along the line since the patches were first posted and there's problems
applying. Could you please rebase against for-2.6.35 and resend?
> It should also be ok to merge the s3c2412 DMA updates via the same
> tree as there's not any intention to be touching this part of the tree
> before the next merge.
If someone could submit these to me that'd be great.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: S3C2412: DMA: Remove I2S FIFO address
2010-05-05 14:00 ` Mark Brown
@ 2010-05-07 1:21 ` Jassi Brar
2010-05-07 15:36 ` Mark Brown
0 siblings, 1 reply; 6+ messages in thread
From: Jassi Brar @ 2010-05-07 1:21 UTC (permalink / raw)
To: alsa-devel; +Cc: broonie, Jassi Brar, ben-linux, lrg
The S3C DMA API doesn't make use of hw_addr.to/from and also
the FIFO addresses are provided from the I2S drivers. So these
fields are redundant.
This patch removes the hw_addr.to/from fields for I2S and the
inclusion of header, paving way for the header to be moved closer
to the I2S controller drivers.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
---
arch/arm/mach-s3c2412/dma.c | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-s3c2412/dma.c b/arch/arm/mach-s3c2412/dma.c
index e880524..7abecfc 100644
--- a/arch/arm/mach-s3c2412/dma.c
+++ b/arch/arm/mach-s3c2412/dma.c
@@ -30,7 +30,6 @@
#include <mach/regs-mem.h>
#include <mach/regs-lcd.h>
#include <mach/regs-sdi.h>
-#include <plat/regs-s3c2412-iis.h>
#include <plat/regs-iis.h>
#include <plat/regs-spi.h>
@@ -119,13 +118,11 @@ static struct s3c24xx_dma_map __initdata s3c2412_dma_mappings[] = {
.name = "i2s-sdi",
.channels = MAP(S3C2412_DMAREQSEL_I2SRX),
.channels_rx = MAP(S3C2412_DMAREQSEL_I2SRX),
- .hw_addr.from = S3C2410_PA_IIS + S3C2412_IISRXD,
},
[DMACH_I2S_OUT] = {
.name = "i2s-sdo",
.channels = MAP(S3C2412_DMAREQSEL_I2STX),
.channels_rx = MAP(S3C2412_DMAREQSEL_I2STX),
- .hw_addr.to = S3C2410_PA_IIS + S3C2412_IISTXD,
},
[DMACH_USB_EP1] = {
.name = "usb-ep1",
--
1.6.2.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: S3C2412: DMA: Remove I2S FIFO address
2010-05-07 1:21 ` [PATCH] ARM: S3C2412: DMA: Remove I2S FIFO address Jassi Brar
@ 2010-05-07 15:36 ` Mark Brown
0 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2010-05-07 15:36 UTC (permalink / raw)
To: Jassi Brar; +Cc: alsa-devel, ben-linux, lrg
On Fri, May 07, 2010 at 10:21:39AM +0900, Jassi Brar wrote:
> The S3C DMA API doesn't make use of hw_addr.to/from and also
> the FIFO addresses are provided from the I2S drivers. So these
> fields are redundant.
> This patch removes the hw_addr.to/from fields for I2S and the
> inclusion of header, paving way for the header to be moved closer
> to the I2S controller drivers.
>
> Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-05-07 15:36 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-27 6:54 [Patches_v2] Reforming S3C I2S towards supporting I2Sv4 Jassi Brar
2010-04-27 9:23 ` Liam Girdwood
2010-05-04 0:53 ` Ben Dooks
2010-05-05 14:00 ` Mark Brown
2010-05-07 1:21 ` [PATCH] ARM: S3C2412: DMA: Remove I2S FIFO address Jassi Brar
2010-05-07 15:36 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).