Skip to contentSkip to conversation

ASoC: Revert "ASoC: SAMSUNG: Add I2S0 internal dma driver"

PATCH In review Mark Brown 5 participants 8 messages Jul 21, 2011 – Aug 12, 2011

Subsystems (3)
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/1 ASoC: Revert "ASoC: SAMSUNG: Add I2S0 internal dma driver"

This reverts commit d7c3e9525ac8e898f1156a1f3a7c5038f6560186 as it does not currently build due to missing dependencies in the Samsung tree.

---
 sound/soc/samsung/Makefile |    2 -
 sound/soc/samsung/idma.c   |  453 --------------------------------------------
 sound/soc/samsung/idma.h   |   26 ---
 3 files changed, 0 insertions(+), 481 deletions(-)
 delete mode 100644 sound/soc/samsung/idma.c
 delete mode 100644 sound/soc/samsung/idma.h
sound/soc/samsung/Makefile +0 -2
index 8509d3c..9eb3b12 100644
@@ -1,6 +1,5 @@
 # S3c24XX Platform Support
 snd-soc-s3c24xx-objs := dma.o
-snd-soc-idma-objs := idma.o
 snd-soc-s3c24xx-i2s-objs := s3c24xx-i2s.o
 snd-soc-s3c2412-i2s-objs := s3c2412-i2s.o
 snd-soc-ac97-objs := ac97.o
@@ -17,7 +16,6 @@ obj-$(CONFIG_SND_S3C_I2SV2_SOC) += snd-soc-s3c-i2s-v2.o
 obj-$(CONFIG_SND_SAMSUNG_SPDIF) += snd-soc-samsung-spdif.o
 obj-$(CONFIG_SND_SAMSUNG_PCM) += snd-soc-pcm.o
 obj-$(CONFIG_SND_SAMSUNG_I2S) += snd-soc-i2s.o
-obj-$(CONFIG_SND_SAMSUNG_I2S) += snd-soc-idma.o
 
 # S3C24XX Machine Support
 snd-soc-jive-wm8750-objs := jive_wm8750.o
sound/soc/samsung/idma.c deleted +0 -453

453 lines not on this page · raw message

sound/soc/samsung/idma.h deleted +0 -26
deleted file mode 100644
index 4827321..0000000
@@ -1,26 +0,0 @@
-/*
- * sound/soc/samsung/idma.h
- *
- * Copyright (c) 2011 Samsung Electronics Co., Ltd
- *		http://www.samsung.com
- *
- *  This program is free software; you can redistribute  it and/or modify it
- *  under  the terms of  the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the  License, or (at your
- *  option) any later version.
- *
- */
-
-#ifndef __SND_SOC_SAMSUNG_IDMA_H_
-#define __SND_SOC_SAMSUNG_IDMA_H_
-
-extern void idma_reg_addr_init(void *regs, dma_addr_t addr);
-
-/* dma_state */
-#define LPAM_DMA_STOP	0
-#define LPAM_DMA_START	1
-
-#define MAX_IDMA_PERIOD (128 * 1024)
-#define MAX_IDMA_BUFFER (160 * 1024)
-
-#endif /* __SND_SOC_SAMSUNG_IDMA_H_ */
Signature · 1 line
1.7.5.4
Acked-by on v1 1/1
#1 lore raw
Quoted 12 lines · Mark Brown

This reverts commit d7c3e9525ac8e898f1156a1f3a7c5038f6560186 as it does not currently build due to missing dependencies in the Samsung tree.

---
 sound/soc/samsung/Makefile |    2 -
 sound/soc/samsung/idma.c   |  453 --------------------------------------------
 sound/soc/samsung/idma.h   |   26 ---
 3 files changed, 0 insertions(+), 481 deletions(-)
 delete mode 100644 sound/soc/samsung/idma.c
 delete mode 100644 sound/soc/samsung/idma.h

Sangbeom, please do let us know of any dependencies in future patches.

Thanks

Liam

Acked-by on v1 1/1
#2 lore raw
In reply to Mark Brown
Quoted 11 lines · Mark Brown

This reverts commit d7c3e9525ac8e898f1156a1f3a7c5038f6560186 as it does not currently build due to missing dependencies in the Samsung tree.

---
 sound/soc/samsung/Makefile |    2 -
 sound/soc/samsung/idma.c   |  453 -------------------------------------------- sound/soc/samsung/idma.h   |   26 ---

 3 files changed, 0 insertions(+), 481 deletions(-)

 delete mode 100644 sound/soc/samsung/idma.c
 delete mode 100644 sound/soc/samsung/idma.h

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

#3 lore raw
In reply to Mark Brown
Quoted 4 lines · Mark Brown

This reverts commit d7c3e9525ac8e898f1156a1f3a7c5038f6560186 as it does not currently build due to missing dependencies in the Samsung tree.

(Cc'ed Kukjin Kim on this)

I'm sorry that I missed the clarification of code dependency. I will try to clarify code dependency in the next time.

idma code have dependency on
ARM: SAMSUNG: Add IRQ_I2S0 definition
(commit ID: 2d21237e38120c2dfbc047b39aa2a56df67bdeec)
ARM: SAMSUNG: Add platform device for idma (commit ID: 2839cc1e7e1f260afc5cf9fb6be5b6c3e9d85fea)

Above 2 commits had already merged on Kukjin kim's tree and then Merged on arm-soc.
Currently, There is no topic branch for idma on Kukjin's tree. So If you need it, You need to merge next-samsung-devel branch on Kukjin's tree.
But It have many other Samsung stuff.
What should I do?

Thanks,
SB Kim

author
#4 lore raw
Quoted 5 lines · Sangbeom Kim

Currently, There is no topic branch for idma on Kukjin's tree. So If you need it, You need to merge next-samsung-devel branch on Kukjin's tree.
But It have many other Samsung stuff.
What should I do?

Since it's already in git history I'll try to remember to reapply it after -rc1 is out and Kukjin's tree has been merged over.

#5 lore raw
Quoted 5 lines · Mark Brown
Quoted 2 lines · Sangbeom Kim

Currently, There is no topic branch for idma on Kukjin's tree. So If you need it, You need to merge next-samsung-devel branch on

Kukjin's

Quoted 6 lines
Quoted 3 lines

tree.
But It have many other Samsung stuff.
What should I do?

Since it's already in git history I'll try to remember to reapply it after -rc1 is out and Kukjin's tree has been merged over.

Hi Mark,

Now, happens following with some Samsung's defconfigs...

sound/soc/samsung/i2s.c:24: fatal error: idma.h: No such file or directory compilation terminated.
make[3]: *** [sound/soc/samsung/i2s.o] Error 1
make[2]: *** [sound/soc/samsung] Error 2
make[1]: *** [sound/soc] Error 2

So it's time to re-apply it in your tree and would be nice to me if you could make some branch for it so that I can merge it to test with other Samsung stuff until being it in mainline.

And is it possible to apply for v3.1? Because this should be in mainline v3.1 stable for working Samsung i2s.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

author
#6 lore raw
Quoted 3 lines · Kukjin Kim

So it's time to re-apply it in your tree and would be nice to me if you could make some branch for it so that I can merge it to test with other Samsung stuff until being it in mainline.

I'm intending to do this at some point before -rc2.

Quoted 2 lines

And is it possible to apply for v3.1? Because this should be in mainline v3.1 stable for working Samsung i2s.

Yes, obviously this is for 3.1.

author
#7 lore raw
In reply to Kukjin Kim
Quoted 2 lines · Kukjin Kim

And is it possible to apply for v3.1? Because this should be in mainline v3.1 stable for working Samsung i2s.

Done now in my local tree (I'm working offline), it'll appear next time I push code out.