ASoC: Create a common directory for AVR32 and ARM9 atmel boards.
PATCH 1/1 ASoC: Create a common directory for AVR32 and ARM9 atmel boards.
Create a common directory for AVR32 and ARM9 atmel boards to unify atmel audio DAI.
---
sound/soc/Kconfig | 3 +- sound/soc/Makefile | 2 +- sound/soc/atmel/Kconfig | 43 ++ sound/soc/atmel/Makefile | 15 + sound/soc/atmel/atmel-pcm.c | 484 +++++++++++++++++++++++ sound/soc/atmel/atmel-pcm.h | 86 ++++ sound/soc/atmel/atmel_ssc_dai.c | 803 ++++++++++++++++++++++++++++++++++++++ sound/soc/atmel/atmel_ssc_dai.h | 121 ++++++ sound/soc/atmel/playpaq_wm8510.c | 523 +++++++++++++++++++++++++ sound/soc/atmel/sam9g20_wm8731.c | 329 ++++++++++++++++ 10 files changed, 2406 insertions(+), 3 deletions(-)
create mode 100644 sound/soc/atmel/Kconfig create mode 100644 sound/soc/atmel/Makefile create mode 100644 sound/soc/atmel/atmel-pcm.c create mode 100644 sound/soc/atmel/atmel-pcm.h create mode 100644 sound/soc/atmel/atmel_ssc_dai.c create mode 100644 sound/soc/atmel/atmel_ssc_dai.h create mode 100644 sound/soc/atmel/playpaq_wm8510.c create mode 100644 sound/soc/atmel/sam9g20_wm8731.c
sound/soc/Kconfig +0 -0
@@ -23,8 +23,7 @@ config SND_SOC_AC97_BUS
bool
# All the supported Soc's
-source "sound/soc/at32/Kconfig"
-source "sound/soc/at91/Kconfig"
+source "sound/soc/atmel/Kconfig"
source "sound/soc/au1x/Kconfig"
source "sound/soc/pxa/Kconfig"
source "sound/soc/s3c24xx/Kconfig"
sound/soc/Makefile +0 -0
@@ -1,5 +1,5 @@
snd-soc-core-objs := soc-core.o soc-dapm.o
obj-$(CONFIG_SND_SOC) += snd-soc-core.o
-obj-$(CONFIG_SND_SOC) += codecs/ at32/ at91/ pxa/ s3c24xx/ sh/ fsl/ davinci/
+obj-$(CONFIG_SND_SOC) += codecs/ atmel/ pxa/ s3c24xx/ sh/ fsl/ davinci/
obj-$(CONFIG_SND_SOC) += omap/ au1x/ blackfin/
sound/soc/atmel/Kconfig new file +43 -0
43 lines not on this page · raw message
sound/soc/atmel/Makefile new file +15 -0
@@ -0,0 +1,15 @@ +# AT91 Platform Support +snd-soc-atmel-pcm-objs := atmel-pcm.o +snd-soc-atmel_ssc_dai-objs := atmel_ssc_dai.o + +obj-$(CONFIG_SND_ATMEL_SOC) += snd-soc-atmel-pcm.o +obj-$(CONFIG_SND_ATMEL_SOC_SSC) += snd-soc-atmel_ssc_dai.o + +# AT91 Machine Support +snd-soc-sam9g20-wm8731-objs := sam9g20_wm8731.o + +# AT32 Machine Support +snd-soc-playpaq-objs := playpaq_wm8510.o + +obj-$(CONFIG_SND_AT91_SOC_SAM9G20_WM8731) += snd-soc-sam9g20-wm8731.o +obj-$(CONFIG_SND_AT32_SOC_PLAYPAQ) += snd-soc-playpaq.o
sound/soc/atmel/atmel-pcm.c new file +484 -0
484 lines not on this page · raw message
sound/soc/atmel/atmel-pcm.h new file +86 -0
86 lines not on this page · raw message
sound/soc/atmel/atmel_ssc_dai.c new file +803 -0
803 lines not on this page · raw message
sound/soc/atmel/atmel_ssc_dai.h new file +121 -0
121 lines not on this page · raw message
sound/soc/atmel/playpaq_wm8510.c new file +523 -0
523 lines not on this page · raw message
sound/soc/atmel/sam9g20_wm8731.c new file +329 -0
329 lines not on this page · raw message
Signature · 1 line
1.5.3.7
Quoted 1 line
From
179f4a719de77810da1a1d74a298dbec14c185cbMon Sep 17 00:00:00 2001
From: Sedji Gaouaou <[email protected]>
Date: Wed, 1 Oct 2008 17:51:49 +0200
Subject: [PATCH] Create a common directory for AVR32 and ARM9 atmel boards.
--- sound/soc/Kconfig | 3 +- sound/soc/Makefile | 2 +- sound/soc/atmel/Kconfig | 43 ++ sound/soc/atmel/Makefile | 15 + sound/soc/atmel/atmel-pcm.c | 484 +++++++++++++++++++++++ sound/soc/atmel/atmel-pcm.h | 86 ++++ sound/soc/atmel/atmel_ssc_dai.c | 803 ++++++++++++++++++++++++++++++++++++++ sound/soc/atmel/atmel_ssc_dai.h | 121 ++++++ sound/soc/atmel/playpaq_wm8510.c | 523 +++++++++++++++++++++++++ sound/soc/atmel/sam9g20_wm8731.c | 329 ++++++++++++++++ 10 files changed, 2406 insertions(+), 3 deletions(-) create mode 100644 sound/soc/atmel/Kconfig create mode 100644 sound/soc/atmel/Makefile create mode 100644 sound/soc/atmel/atmel-pcm.c create mode 100644 sound/soc/atmel/atmel-pcm.h create mode 100644 sound/soc/atmel/atmel_ssc_dai.c create mode 100644 sound/soc/atmel/atmel_ssc_dai.h create mode 100644 sound/soc/atmel/playpaq_wm8510.c create mode 100644 sound/soc/atmel/sam9g20_wm8731.c
sound/soc/Kconfig +1 -2
@@ -23,8 +23,7 @@ config SND_SOC_AC97_BUS bool # All the supported Soc's -source "sound/soc/at32/Kconfig" -source "sound/soc/at91/Kconfig" +source "sound/soc/atmel/Kconfig" source "sound/soc/au1x/Kconfig" source "sound/soc/pxa/Kconfig" source "sound/soc/s3c24xx/Kconfig"
sound/soc/Makefile +1 -1
@@ -1,5 +1,5 @@ snd-soc-core-objs := soc-core.o soc-dapm.o obj-$(CONFIG_SND_SOC) += snd-soc-core.o -obj-$(CONFIG_SND_SOC) += codecs/ at32/ at91/ pxa/ s3c24xx/ sh/ fsl/ davinci/ +obj-$(CONFIG_SND_SOC) += codecs/ atmel/ pxa/ s3c24xx/ sh/ fsl/ davinci/ obj-$(CONFIG_SND_SOC) += omap/ au1x/ blackfin/
sound/soc/atmel/Kconfig new file +43 -0
43 lines not on this page · raw message
sound/soc/atmel/Makefile new file +15 -0
@@ -0,0 +1,15 @@ +# AT91 Platform Support +snd-soc-atmel-pcm-objs := atmel-pcm.o +snd-soc-atmel_ssc_dai-objs := atmel_ssc_dai.o + +obj-$(CONFIG_SND_ATMEL_SOC) += snd-soc-atmel-pcm.o +obj-$(CONFIG_SND_ATMEL_SOC_SSC) += snd-soc-atmel_ssc_dai.o + +# AT91 Machine Support +snd-soc-sam9g20-wm8731-objs := sam9g20_wm8731.o + +# AT32 Machine Support +snd-soc-playpaq-objs := playpaq_wm8510.o + +obj-$(CONFIG_SND_AT91_SOC_SAM9G20_WM8731) += snd-soc-sam9g20-wm8731.o +obj-$(CONFIG_SND_AT32_SOC_PLAYPAQ) += snd-soc-playpaq.o
sound/soc/atmel/atmel-pcm.c new file +484 -0
484 lines not on this page · raw message
sound/soc/atmel/atmel-pcm.h new file +86 -0
39 lines not on this page · raw message
sound/soc/atmel/atmel_ssc_dai.c new file +803 -0
803 lines not on this page · raw message
sound/soc/atmel/atmel_ssc_dai.h new file +121 -0
121 lines not on this page · raw message
sound/soc/atmel/playpaq_wm8510.c new file +523 -0
523 lines not on this page · raw message
sound/soc/atmel/sam9g20_wm8731.c new file +329 -0
329 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.5.3.7
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Part of the diff is not shown here. View the raw message.
Quoted 4 lines · Sedji Gaouaou
Create a common directory for AVR32 and ARM9 atmel boards to unify atmel audio DAI.
Signed-off-by Sedji Gaouaou <[email protected]>
Hrm. It doesn't look like playpaq_wm8510.c will build after this change
- for one thing, at32-pcm.h and at32-ssc.h don't exist any more in the new atmel directory but there's no change to the file to reflect that. If you're unable to test AVR32 yourself then perhaps Geoffrey (CCed) will be able to help out here?
Also, please note the changes to the playpaq driver which were made in commit c2d8a0f79a63e3d3ead52fba3a6300f86514758b which was merged into Takashi's tree the other day.
Can I also suggest splitting this up so that you do the merge of the existing code in one patch then add your new board drivers in another? If nothing else it'd bring down the size of the main diff. :)
Quoted 5 lines · Mark Brown
Quoted 2 lines · Sedji Gaouaou
Create a common directory for AVR32 and ARM9 atmel boards to unify atmel audio DAI.
Quoted 8 lines
Quoted 1 line
Signed-off-by Sedji Gaouaou <[email protected]>Hrm. It doesn't look like
playpaq_wm8510.cwill build after this change
- for one thing,at32-pcm.handat32-ssc.hdon't exist any more in the new atmel directory but there's no change to the file to reflect that. If you're unable to test AVR32 yourself then perhaps Geoffrey (CCed) will be able to help out here?
Yes my mistake!! I will change change right now. Nevertheless I don't even have a AVR compiler so I can't really test the AVR code....
Quoted 4 lines
Also, please note the changes to the playpaq driver which were made in commit
c2d8a0f79a63e3d3ead52fba3a6300f86514758bwhich was merged into Takashi's tree the other day.
Again my mistake :)
Quoted 4 lines
Can I also suggest splitting this up so that you do the merge of the existing code in one patch then add your new board drivers in another? If nothing else it'd bring down the size of the main diff. :)
Ok, no worries. I will create:
a patch that contains the atmel_ssc_dai.c and .h file, a patch for the atmel-pcm.c/.h files
a patch playback_wm8510.c and sam9g20_wm8731.c files. a patch for the Makefile and the Kconfig.
Is that ok?
Quoted 2 lines · Sedji Gaouaou
Yes my mistake!! I will change change right now. Nevertheless I don't even have a AVR compiler so I can't really test the AVR code....
Ah, right. While I understand that the hardware is pretty much identical are you sure that the APIs for accessing it are the same on both AVR32 and AT91? My understanding was that there was some work required to handle both but I've no familiarity with either architecture.
CCing in Haavard Skinnemoen for AVR32 advice: Haavard, Sedji is submitting patches which unify the audio support for AT91 and AVR32.
Quoted 7 lines
Ok, no worries. I will create:
a patch that contains theatmel_ssc_dai.cand .h file, a patch for the atmel-pcm.c/.h files
a patchplayback_wm8510.candsam9g20_wm8731.cfiles. a patch for theMakefileand theKconfig.Is that ok?
That's certainly good for review. We can always squash the patches down when they go to git in order to try to preserve the history. No need to keep reposting the patch to remove the old drivers, either (unless you switch to using git format-patch -M to show the code moving around).
Hi
Quoted 9 lines · Mark Brown
On Thu, Oct 02, 2008 at 06:00:37PM +0200, Sedji Gaouaou wrote Ah, right. While I understand that the hardware is pretty much identical are you sure that the APIs for accessing it are the same on both AVR32 and AT91? My understanding was that there was some work required to handle both but I've no familiarity with either architecture.
CCing in Haavard Skinnemoen for AVR32 advice: Haavard, Sedji is submitting patches which unify the audio support for AT91 and AVR32.
Actually I based my patch on the at32-pcm and at32-ssc files which were based on at91-ssc and at91-pcm files, so I don't think there should be any differences.
Regards,
Sedji
Quoted 7 lines · Sedji Gaouaou
Quoted 3 lines
Ah, right. While I understand that the hardware is pretty much identical are you sure that the APIs for accessing it are the same on both AVR32 and AT91? My understanding was that there was some work required to
Actually I based my patch on the at32-pcm and at32-ssc files which were based on at91-ssc and at91-pcm files, so I don't think there should be any differences.
Right, they're based on each other but they use different APIs to access the hardware - this is the most substantial difference between them. Are you sure that the API you have chosen to use is availiable for both architectures? It's possible that it is but there's no mention of this issue in your patch description and I'd like to confirm.
Quoted 10 lines · Mark Brown
Quoted 7 lines · Sedji Gaouaou
Quoted 3 lines
Ah, right. While I understand that the hardware is pretty much identical are you sure that the APIs for accessing it are the same on both AVR32 and AT91? My understanding was that there was some work required to
Actually I based my patch on the at32-pcm and at32-ssc files which were based on at91-ssc and at91-pcm files, so I don't think there should be any differences.
Quoted 10 lines
Right, they're based on each other but they use different APIs to access the hardware - this is the most substantial difference between them. Are you sure that the API you have chosen to use is availiable for both architectures? It's possible that it is but there's no mention of this issue in your patch description and I'd like to confirm.
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
If you are talking about the API to access ssc(ssc_writel and ssc_readl), it was basically why I needed a new driver in the first place. Indeed we wanted to use the same API across all atmel platforms.
Quoted 3 lines · Sedji Gaouaou
If you are talking about the API to access
ssc(ssc_writel and ssc_readl), it was basically why I needed a new driver in the first place. Indeed we wanted to use the same API across all atmel platforms.
OK, that's good. It'd be helpful if you could mention this in your patch descriptions - at the minute there's very little detail there which makes issues like this less clear than they could be.
I'd still like to see this tested at least somewhat on AVR32, just to make sure. Even a build test would be good.
Quoted 7 lines · Mark Brown
OK, that's good. It'd be helpful if you could mention this in your patch descriptions - at the minute there's very little detail there which makes issues like this less clear than they could be.
I'd still like to see this tested at least somewhat on AVR32, just to make sure. Even a build test would be good.
For sure!
I am currently writing a new set of patches, so I will add some comments to improve readability.
Anyway I agree we should wait for some avr guys to test it.
BTW I would like to thank you for your time and consideration!
Regards,
Sedji
Quoted 11 lines · Mark Brown
Quoted 3 lines · Sedji Gaouaou
If you are talking about the API to access
ssc(ssc_writel and ssc_readl), it was basically why I needed a new driver in the first place. Indeed we wanted to use the same API across all atmel platforms.OK, that's good. It'd be helpful if you could mention this in your patch descriptions - at the minute there's very little detail there which makes issues like this less clear than they could be.
I'd still like to see this tested at least somewhat on AVR32, just to make sure. Even a build test would be good.
I'm planning on firing up the AVR32 board this afternoon.
---
Geoffrey
Quoted 2 lines · Mark Brown
I'd still like to see this tested at least somewhat on AVR32, just to make sure. Even a build test would be good.
I can do a build test, but I don't have any board with a supported codec. Ideally, the at73c213 driver should be moved over to the SoC framework, but I'm not sure if I'll find much time to do it in the near future.
Haavard
Hi Haavard,
Quoted 11 lines · Haavard Skinnemoen
Quoted 2 lines · Mark Brown
I'd still like to see this tested at least somewhat on AVR32, just to make sure. Even a build test would be good.
I can do a build test, but I don't have any board with a supported codec. Ideally, the at73c213 driver should be moved over to the SoC framework, but I'm not sure if I'll find much time to do it in the near future.
Haavard
This will be my next task I think, I will try to move the at73c213 driver, but I wanted to have a clean ssc dai first.
Quoted 2 lines · Sedji Gaouaou
This will be my next task I think, I will try to move the at73c213 driver, but I wanted to have a clean ssc dai first.
That would be great!
Btw, where is the patch you want me to test? Should I apply all the three patches you sent me earlier, or is there a newer version somewhere?
Haavard
Quoted 4 lines · Haavard Skinnemoen
Quoted 2 lines · Sedji Gaouaou
This will be my next task I think, I will try to move the at73c213 driver, but I wanted to have a clean ssc dai first.
Quoted 8 lines
That would be great!
Btw, where is the patch you want me to test? Should I apply all the three patches you sent me earlier, or is there a newer version somewhere?
Haavard
I have just sent a new version in a set of 7 patches.
But you will still need to apply the patch where I removed all at32 and at91 directories([alsa-devel] [PATCH]ASoC: Remove at91 and at32 directories).
Quoted 11 lines · Mark Brown
Quoted 3 lines · Sedji Gaouaou
If you are talking about the API to access
ssc(ssc_writel and ssc_readl), it was basically why I needed a new driver in the first place. Indeed we wanted to use the same API across all atmel platforms.OK, that's good. It'd be helpful if you could mention this in your patch descriptions - at the minute there's very little detail there which makes issues like this less clear than they could be.
I'd still like to see this tested at least somewhat on AVR32, just to make sure. Even a build test would be good.
Argh! I was expecting to have to deal with some bitrot when I tried the patch on Friday, but instead I got board rot. My board won't fire up properly anymore.
Has anyone here with an AVR32 toolchain tried to compile the patch, or do I need to go ahead and at least do this?
---
Geoffrey
Quoted 7 lines · Sedji Gaouaou
Quoted 6 lines · Haavard Skinnemoen
Quoted 2 lines · Sedji Gaouaou
This will be my next task I think, I will try to move the at73c213 driver, but I wanted to have a clean ssc dai first.
That would be great!
Quoted 7 lines
Quoted 6 lines
Btw, where is the patch you want me to test? Should I apply all the three patches you sent me earlier, or is there a newer version somewhere?
Haavard
I have just sent a new version in a set of 7 patches.
Not to me...
Quoted 3 lines
But you will still need to apply the patch where I removed all at32 and at91
directories([alsa-devel] [PATCH]ASoC: Remove at91 and at32 directories).
Can you please just send me the whole bunch so that I know what we're talking about?
Haavard
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Quoted 8 lines · Haavard Skinnemoen
Quoted 3 lines · Sedji Gaouaou
But you will still need to apply the patch where I removed all at32 and at91
directories([alsa-devel] [PATCH]ASoC: Remove at91 and at32 directories).Can you please just send me the whole bunch so that I know what we're talking about?
The removal patch doesn't really need to be posted at all while we're reviewing stuff (and it's rather too large for alsa-devel anyway). The other patches that Sedji is posting update the Makefile and Kconfig to stop referencing the existing at91 and at32 directories anyway.