[06/26] davinci: EDMA minor cleanup

Commit Message

Kevin Hilman July 6, 2009, 9:14 p.m. UTC

From: David Brownell <[e-mail]>

Minor EDMA cleanup: remove unused SoC-specific #define; and when
requesting the channel controller region, use the device's name
(to be more useful on chips with multiple such controllers).

Signed-off-by: David Brownell <[e-mail]>
Signed-off-by: Kevin Hilman <[e-mail]>
---
 arch/arm/mach-davinci/dma.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

Comments

Troy Kisky July 7, 2009, 11:54 p.m. UTC | #1

Mark Brown wrote:
> On Mon, Jul 06, 2009 at 02:50:44PM -0700, Kevin Hilman wrote:
>> Mark Brown <[e-mail]> writes:
> 
>>> I guess it's safe for me to go ahead and merge the ASoC changes that
>>> were waiting for this now, then?  
> 
>> Yes, go ahead.
> 
>>> IIRC it's runtime dependencies only so there should be no merge
>>> issues.
> 
>> There shouldn't be any merge issues, but there will be some compile
>> issues.
> 
> I've done the merge now.  There were some conflicts in the I2S driver
> which I think I've resolved but if someone could check that things are
> still OK:
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.32
> 
I works for me after adding

#include <mach/asp.h>

Troy

Troy Kisky July 8, 2009, 1:09 a.m. UTC | #2

Mark Brown wrote:
> On Mon, Jul 06, 2009 at 02:50:44PM -0700, Kevin Hilman wrote:
>> Mark Brown <[e-mail]> writes:
> 
>>> I guess it's safe for me to go ahead and merge the ASoC changes that
>>> were waiting for this now, then?  
> 
>> Yes, go ahead.
> 
>>> IIRC it's runtime dependencies only so there should be no merge
>>> issues.
> 
>> There shouldn't be any merge issues, but there will be some compile
>> issues.
> 
> I've done the merge now.  There were some conflicts in the I2S driver
> which I think I've resolved but if someone could check that things are
> still OK:
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.32
> 
doesn't the line

struct davinci_mcbsp_dev *dev = davinci_i2s_dai.private_data;

limit us to one device?

Mani, Arun July 9, 2009, 11:16 p.m. UTC | #3

Hi,
I am trying the latest 2.6.31 rc2 branch. I am trying to make the Audio work. I found that the I2S clock is set to NULL. Because of this I am getting a NODEV error. If I commented the check, I was able to map the I2S to the AIC33X. but I am not getting any sound. I tried the aplay and arecord and got the read/write errors.

Any thoughts?

Thanks,
Arun.

-----Original Message-----
From: [e-mail] [mailto:[e-mail]] On Behalf Of Troy Kisky
Sent: Tuesday, July 07, 2009 9:09 PM
To: Mark Brown
Cc: [e-mail]; [e-mail]; Medisetty, Naresh
Subject: Re: [PATCH 07/26] davinci: dm646x: Adds McASP clock

Mark Brown wrote:
> On Mon, Jul 06, 2009 at 02:50:44PM -0700, Kevin Hilman wrote:
>> Mark Brown <[e-mail]> writes:
> 
>>> I guess it's safe for me to go ahead and merge the ASoC changes that
>>> were waiting for this now, then?  
> 
>> Yes, go ahead.
> 
>>> IIRC it's runtime dependencies only so there should be no merge
>>> issues.
> 
>> There shouldn't be any merge issues, but there will be some compile
>> issues.
> 
> I've done the merge now.  There were some conflicts in the I2S driver
> which I think I've resolved but if someone could check that things are
> still OK:
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.32
> 
doesn't the line

struct davinci_mcbsp_dev *dev = davinci_i2s_dai.private_data;

limit us to one device?

Troy Kisky July 10, 2009, 7:47 p.m. UTC | #4

Mani, Arun wrote:
> Hi,
> I am trying the latest 2.6.31 rc2 branch. I am trying to make the Audio work.
>  I found that the I2S clock is set to NULL. Because of this I am getting a NODEV error.
> If I commented the check, I was able to map the I2S to the AIC33X. but I am not getting any sound.
You need a clock, so don't comment out the check, rather give it one. ie.

+static struct snd_platform_data snd_data = {
+       .clk_name       = "asp0",
+};
+
 static struct i2c_board_info __initdata i2c_info[] =  {
        {
                I2C_BOARD_INFO("ths8200", 0x21),
@@ -230,6 +234,7 @@ static __init void board_init(void)
        platform_add_devices(davinci_devices,
                             ARRAY_SIZE(davinci_devices));
        davinci_serial_init(&uart_config);
+       dm644x_init_asp(&snd_data);


> I tried the aplay and arecord and got the read/write errors.
> 
> Any thoughts?
> 
> Thanks,
> Arun.
>

Mani, Arun July 10, 2009, 9:25 p.m. UTC | #5

The clock is indeed initialized in board_dm355.c. The problem is the clock name is not given to the clk_get function. I hard coded the clock name to asp1(since it is dm355) and found out that this helps register the i2s and aic33x. but when I ran aplay and arecord, the clock is not correct and moreover there are lot or underruns detected. BTW it is also detected in the DM6446 case.


-----Original Message-----
From: Troy Kisky [mailto:[e-mail]] 
Sent: Friday, July 10, 2009 3:48 PM
To: Mani, Arun
Cc: Mark Brown; [e-mail]; [e-mail]; Medisetty, Naresh
Subject: Re: [PATCH 07/26] davinci: dm646x: Adds McASP clock

Mani, Arun wrote:
> Hi,
> I am trying the latest 2.6.31 rc2 branch. I am trying to make the Audio work.
>  I found that the I2S clock is set to NULL. Because of this I am getting a NODEV error.
> If I commented the check, I was able to map the I2S to the AIC33X. but I am not getting any sound.
You need a clock, so don't comment out the check, rather give it one. ie.

+static struct snd_platform_data snd_data = {
+       .clk_name       = "asp0",
+};
+
 static struct i2c_board_info __initdata i2c_info[] =  {
        {
                I2C_BOARD_INFO("ths8200", 0x21),
@@ -230,6 +234,7 @@ static __init void board_init(void)
        platform_add_devices(davinci_devices,
                             ARRAY_SIZE(davinci_devices));
        davinci_serial_init(&uart_config);
+       dm644x_init_asp(&snd_data);


> I tried the aplay and arecord and got the read/write errors.
> 
> Any thoughts?
> 
> Thanks,
> Arun.
>

[e-mail] July 13, 2009, 3:29 p.m. UTC | #6

Troy,

Did you happen to test Audio on DM6446 with the latest on linux-davinci tree?

For the same clock name issue Arun is running into on DM355, the codecs are not getting detected on DM6446.

Advanced Linux Sound Architecture Driver Version 1.0.20.
No device for DAI tlv320aic3x
No device for DAI davinci-i2s
ALSA device list:
  No soundcards found.

I am thinking we are seeing these issues due to the way dm355 (or dm6446) clocks are defined on linux-davinci tree and the mach-davinci on kernel.org.

>From arch/arm/mach-davinci/dm355.c of kernel.org
CLK("soc-audio.0", NULL, &asp0_clk),
CLK("soc-audio.1", NULL, &asp1_clk),

And from arch/arm/mach-davinci/dm355.c of linux-davinci tree
CLK(NULL, "asp0", &asp0_clk),
CLK(NULL, "asp1", &asp1_clk),

Kevin, any comments?

Thanks
Sneha

> -----Original Message-----
> From: [e-mail]
> [mailto:[e-mail]] On Behalf
> Of Mani, Arun
> Sent: Friday, July 10, 2009 5:26 PM
> To: Troy Kisky
> Cc: [e-mail]; Mark Brown; linux-arm-
> [e-mail]; Medisetty, Naresh
> Subject: RE: [PATCH 07/26] davinci: dm646x: Adds McASP clock
> 
> The clock is indeed initialized in board_dm355.c. The problem is the clock
> name is not given to the clk_get function. I hard coded the clock name to
> asp1(since it is dm355) and found out that this helps register the i2s and
> aic33x. but when I ran aplay and arecord, the clock is not correct and
> moreover there are lot or underruns detected. BTW it is also detected in
> the DM6446 case.
> 
> 
> -----Original Message-----
> From: Troy Kisky [mailto:[e-mail]]
> Sent: Friday, July 10, 2009 3:48 PM
> To: Mani, Arun
> Cc: Mark Brown; [e-mail]; linux-arm-
> [e-mail]; Medisetty, Naresh
> Subject: Re: [PATCH 07/26] davinci: dm646x: Adds McASP clock
> 
> Mani, Arun wrote:
> > Hi,
> > I am trying the latest 2.6.31 rc2 branch. I am trying to make the Audio
> work.
> >  I found that the I2S clock is set to NULL. Because of this I am getting
> a NODEV error.
> > If I commented the check, I was able to map the I2S to the AIC33X. but I
> am not getting any sound.
> You need a clock, so don't comment out the check, rather give it one. ie.
> 
> +static struct snd_platform_data snd_data = {
> +       .clk_name       = "asp0",
> +};
> +
>  static struct i2c_board_info __initdata i2c_info[] =  {
>         {
>                 I2C_BOARD_INFO("ths8200", 0x21),
> @@ -230,6 +234,7 @@ static __init void board_init(void)
>         platform_add_devices(davinci_devices,
>                              ARRAY_SIZE(davinci_devices));
>         davinci_serial_init(&uart_config);
> +       dm644x_init_asp(&snd_data);
> 
> 
> > I tried the aplay and arecord and got the read/write errors.
> >
> > Any thoughts?
> >
> > Thanks,
> > Arun.
> >
> 
> 
> _______________________________________________
> Davinci-linux-open-source mailing list
> [e-mail]
> http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source

Kevin Hilman July 13, 2009, 3:55 p.m. UTC | #7

"Narnakaje, Snehaprabha" <[e-mail]> writes:

> Did you happen to test Audio on DM6446 with the latest on linux-davinci tree?
>
> For the same clock name issue Arun is running into on DM355, the codecs are not getting detected on DM6446.
>
> Advanced Linux Sound Architecture Driver Version 1.0.20.
> No device for DAI tlv320aic3x
> No device for DAI davinci-i2s
> ALSA device list:
>   No soundcards found.
>
> I am thinking we are seeing these issues due to the way dm355 (or dm6446) clocks are defined on linux-davinci tree and the mach-davinci on kernel.org.
>
>>From arch/arm/mach-davinci/dm355.c of kernel.org
> CLK("soc-audio.0", NULL, &asp0_clk),
> CLK("soc-audio.1", NULL, &asp1_clk),
>
> And from arch/arm/mach-davinci/dm355.c of linux-davinci tree
> CLK(NULL, "asp0", &asp0_clk),
> CLK(NULL, "asp1", &asp1_clk),
>
> Kevin, any comments?

Yes, ASoC drivers are headed upstream and there's currently a mismatch
between the patches that are going upstream via linux-davinci and those
going upstream via the ASoC tree.

linux-davinci is missing some of the changes that are queued up in
Mark Brown's for-2.6.32 branch, namely the change that addes
the name argument to clk_get().

On linux-davinci, if you switch back to this form of CLK definition:

CLK("soc-audio.0", NULL, &asp0_clk),
CLK("soc-audio.1", NULL, &asp1_clk),

does it work for you again?

Kevin


>> -----Original Message-----
>> From: [e-mail]
>> [mailto:[e-mail]] On Behalf
>> Of Mani, Arun
>> Sent: Friday, July 10, 2009 5:26 PM
>> To: Troy Kisky
>> Cc: [e-mail]; Mark Brown; linux-arm-
>> [e-mail]; Medisetty, Naresh
>> Subject: RE: [PATCH 07/26] davinci: dm646x: Adds McASP clock
>> 
>> The clock is indeed initialized in board_dm355.c. The problem is the clock
>> name is not given to the clk_get function. I hard coded the clock name to
>> asp1(since it is dm355) and found out that this helps register the i2s and
>> aic33x. but when I ran aplay and arecord, the clock is not correct and
>> moreover there are lot or underruns detected. BTW it is also detected in
>> the DM6446 case.
>> 
>> 
>> -----Original Message-----
>> From: Troy Kisky [mailto:[e-mail]]
>> Sent: Friday, July 10, 2009 3:48 PM
>> To: Mani, Arun
>> Cc: Mark Brown; [e-mail]; linux-arm-
>> [e-mail]; Medisetty, Naresh
>> Subject: Re: [PATCH 07/26] davinci: dm646x: Adds McASP clock
>> 
>> Mani, Arun wrote:
>> > Hi,
>> > I am trying the latest 2.6.31 rc2 branch. I am trying to make the Audio
>> work.
>> >  I found that the I2S clock is set to NULL. Because of this I am getting
>> a NODEV error.
>> > If I commented the check, I was able to map the I2S to the AIC33X. but I
>> am not getting any sound.
>> You need a clock, so don't comment out the check, rather give it one. ie.
>> 
>> +static struct snd_platform_data snd_data = {
>> +       .clk_name       = "asp0",
>> +};
>> +
>>  static struct i2c_board_info __initdata i2c_info[] =  {
>>         {
>>                 I2C_BOARD_INFO("ths8200", 0x21),
>> @@ -230,6 +234,7 @@ static __init void board_init(void)
>>         platform_add_devices(davinci_devices,
>>                              ARRAY_SIZE(davinci_devices));
>>         davinci_serial_init(&uart_config);
>> +       dm644x_init_asp(&snd_data);
>> 
>> 
>> > I tried the aplay and arecord and got the read/write errors.
>> >
>> > Any thoughts?
>> >
>> > Thanks,
>> > Arun.
>> >
>> 
>> 
>> _______________________________________________
>> Davinci-linux-open-source mailing list
>> [e-mail]
>> http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
> _______________________________________________
> Davinci-linux-open-source mailing list
> [e-mail]
> http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source

Mani, Arun July 13, 2009, 4:15 p.m. UTC | #8

Hi Kevin, 
The change does initialize the codec, but still the clock doesn't seem to be correct. I am still getting the underrun messages and also clock times out faster than it is suppose to be. For example I have 10 secs loopback using aplay and arecord, but the app runs only for 2 secs.

Thanks,
Arun

-----Original Message-----
From: Kevin Hilman [mailto:[e-mail]] 
Sent: Monday, July 13, 2009 11:55 AM
To: Narnakaje, Snehaprabha
Cc: Mani, Arun; Troy Kisky; [e-mail]; Mark Brown; [e-mail]; Medisetty, Naresh
Subject: Re: [PATCH 07/26] davinci: dm646x: Adds McASP clock

"Narnakaje, Snehaprabha" <[e-mail]> writes:

> Did you happen to test Audio on DM6446 with the latest on linux-davinci tree?
>
> For the same clock name issue Arun is running into on DM355, the codecs are not getting detected on DM6446.
>
> Advanced Linux Sound Architecture Driver Version 1.0.20.
> No device for DAI tlv320aic3x
> No device for DAI davinci-i2s
> ALSA device list:
>   No soundcards found.
>
> I am thinking we are seeing these issues due to the way dm355 (or dm6446) clocks are defined on linux-davinci tree and the mach-davinci on kernel.org.
>
>>From arch/arm/mach-davinci/dm355.c of kernel.org
> CLK("soc-audio.0", NULL, &asp0_clk),
> CLK("soc-audio.1", NULL, &asp1_clk),
>
> And from arch/arm/mach-davinci/dm355.c of linux-davinci tree
> CLK(NULL, "asp0", &asp0_clk),
> CLK(NULL, "asp1", &asp1_clk),
>
> Kevin, any comments?

Yes, ASoC drivers are headed upstream and there's currently a mismatch
between the patches that are going upstream via linux-davinci and those
going upstream via the ASoC tree.

linux-davinci is missing some of the changes that are queued up in
Mark Brown's for-2.6.32 branch, namely the change that addes
the name argument to clk_get().

On linux-davinci, if you switch back to this form of CLK definition:

CLK("soc-audio.0", NULL, &asp0_clk),
CLK("soc-audio.1", NULL, &asp1_clk),

does it work for you again?

Kevin


>> -----Original Message-----
>> From: [e-mail]
>> [mailto:[e-mail]] On Behalf
>> Of Mani, Arun
>> Sent: Friday, July 10, 2009 5:26 PM
>> To: Troy Kisky
>> Cc: [e-mail]; Mark Brown; linux-arm-
>> [e-mail]; Medisetty, Naresh
>> Subject: RE: [PATCH 07/26] davinci: dm646x: Adds McASP clock
>> 
>> The clock is indeed initialized in board_dm355.c. The problem is the clock
>> name is not given to the clk_get function. I hard coded the clock name to
>> asp1(since it is dm355) and found out that this helps register the i2s and
>> aic33x. but when I ran aplay and arecord, the clock is not correct and
>> moreover there are lot or underruns detected. BTW it is also detected in
>> the DM6446 case.
>> 
>> 
>> -----Original Message-----
>> From: Troy Kisky [mailto:[e-mail]]
>> Sent: Friday, July 10, 2009 3:48 PM
>> To: Mani, Arun
>> Cc: Mark Brown; [e-mail]; linux-arm-
>> [e-mail]; Medisetty, Naresh
>> Subject: Re: [PATCH 07/26] davinci: dm646x: Adds McASP clock
>> 
>> Mani, Arun wrote:
>> > Hi,
>> > I am trying the latest 2.6.31 rc2 branch. I am trying to make the Audio
>> work.
>> >  I found that the I2S clock is set to NULL. Because of this I am getting
>> a NODEV error.
>> > If I commented the check, I was able to map the I2S to the AIC33X. but I
>> am not getting any sound.
>> You need a clock, so don't comment out the check, rather give it one. ie.
>> 
>> +static struct snd_platform_data snd_data = {
>> +       .clk_name       = "asp0",
>> +};
>> +
>>  static struct i2c_board_info __initdata i2c_info[] =  {
>>         {
>>                 I2C_BOARD_INFO("ths8200", 0x21),
>> @@ -230,6 +234,7 @@ static __init void board_init(void)
>>         platform_add_devices(davinci_devices,
>>                              ARRAY_SIZE(davinci_devices));
>>         davinci_serial_init(&uart_config);
>> +       dm644x_init_asp(&snd_data);
>> 
>> 
>> > I tried the aplay and arecord and got the read/write errors.
>> >
>> > Any thoughts?
>> >
>> > Thanks,
>> > Arun.
>> >
>> 
>> 
>> _______________________________________________
>> Davinci-linux-open-source mailing list
>> [e-mail]
>> http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
> _______________________________________________
> Davinci-linux-open-source mailing list
> [e-mail]
> http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source

[e-mail] July 21, 2009, 1:54 p.m. UTC | #9

On Mon, Jul 13, 2009 at 21:45:04, Mani, Arun wrote:
> Hi Kevin, 
> The change does initialize the codec, but still the clock doesn't seem to
be correct. I am still getting the underrun messages and also clock times
out faster than it is suppose to be. For example I have 10 secs loopback
using aplay and arecord, but the app runs only for 2 secs.
> 

On DM646x EVM too similar issues exist. Probing the codec bit and word
clocks,
it was observed that the frequencies are 2 times higher than the frequencies
observed with a working version. I have not yet examined the codec register
values, will probably continue with this debugging tomorrow. 

Regards,
Chaithrika

> Thanks,
> Arun
> 
> -----Original Message-----
> From: Kevin Hilman [mailto:[e-mail]] 
> Sent: Monday, July 13, 2009 11:55 AM
> To: Narnakaje, Snehaprabha
> Cc: Mani, Arun; Troy Kisky;
[e-mail]; Mark Brown;
[e-mail]; Medisetty, Naresh
> Subject: Re: [PATCH 07/26] davinci: dm646x: Adds McASP clock
> 
> "Narnakaje, Snehaprabha" <[e-mail]> writes:
> 
> > Did you happen to test Audio on DM6446 with the latest on linux-davinci
tree?
> >
> > For the same clock name issue Arun is running into on DM355, the codecs
are not getting detected on DM6446.
> >
> > Advanced Linux Sound Architecture Driver Version 1.0.20.
> > No device for DAI tlv320aic3x
> > No device for DAI davinci-i2s
> > ALSA device list:
> >   No soundcards found.
> >
> > I am thinking we are seeing these issues due to the way dm355 (or
dm6446) clocks are defined on linux-davinci tree and the mach-davinci on
kernel.org.
> >
> >>From arch/arm/mach-davinci/dm355.c of kernel.org
> > CLK("soc-audio.0", NULL, &asp0_clk),
> > CLK("soc-audio.1", NULL, &asp1_clk),
> >
> > And from arch/arm/mach-davinci/dm355.c of linux-davinci tree
> > CLK(NULL, "asp0", &asp0_clk),
> > CLK(NULL, "asp1", &asp1_clk),
> >
> > Kevin, any comments?
> 
> Yes, ASoC drivers are headed upstream and there's currently a mismatch
> between the patches that are going upstream via linux-davinci and those
> going upstream via the ASoC tree.
> 
> linux-davinci is missing some of the changes that are queued up in
> Mark Brown's for-2.6.32 branch, namely the change that addes
> the name argument to clk_get().
> 
> On linux-davinci, if you switch back to this form of CLK definition:
> 
> CLK("soc-audio.0", NULL, &asp0_clk),
> CLK("soc-audio.1", NULL, &asp1_clk),
> 
> does it work for you again?
> 
> Kevin
> 
> 
> >> -----Original Message-----
> >> From: [e-mail]
> >> [mailto:[e-mail]] On
Behalf
> >> Of Mani, Arun
> >> Sent: Friday, July 10, 2009 5:26 PM
> >> To: Troy Kisky
> >> Cc: [e-mail]; Mark Brown;
linux-arm-
> >> [e-mail]; Medisetty, Naresh
> >> Subject: RE: [PATCH 07/26] davinci: dm646x: Adds McASP clock
> >> 
> >> The clock is indeed initialized in board_dm355.c. The problem is the
clock
> >> name is not given to the clk_get function. I hard coded the clock name
to
> >> asp1(since it is dm355) and found out that this helps register the i2s
and
> >> aic33x. but when I ran aplay and arecord, the clock is not correct and
> >> moreover there are lot or underruns detected. BTW it is also detected
in
> >> the DM6446 case.
> >> 
> >> 
> >> -----Original Message-----
> >> From: Troy Kisky [mailto:[e-mail]]
> >> Sent: Friday, July 10, 2009 3:48 PM
> >> To: Mani, Arun
> >> Cc: Mark Brown; [e-mail];
linux-arm-
> >> [e-mail]; Medisetty, Naresh
> >> Subject: Re: [PATCH 07/26] davinci: dm646x: Adds McASP clock
> >> 
> >> Mani, Arun wrote:
> >> > Hi,
> >> > I am trying the latest 2.6.31 rc2 branch. I am trying to make the
Audio
> >> work.
> >> >  I found that the I2S clock is set to NULL. Because of this I am
getting
> >> a NODEV error.
> >> > If I commented the check, I was able to map the I2S to the AIC33X.
but I
> >> am not getting any sound.
> >> You need a clock, so don't comment out the check, rather give it one.
ie.
> >> 
> >> +static struct snd_platform_data snd_data = {
> >> +       .clk_name       = "asp0",
> >> +};
> >> +
> >>  static struct i2c_board_info __initdata i2c_info[] =  {
> >>         {
> >>                 I2C_BOARD_INFO("ths8200", 0x21),
> >> @@ -230,6 +234,7 @@ static __init void board_init(void)
> >>         platform_add_devices(davinci_devices,
> >>                              ARRAY_SIZE(davinci_devices));
> >>         davinci_serial_init(&uart_config);
> >> +       dm644x_init_asp(&snd_data);
> >> 
> >> 
> >> > I tried the aplay and arecord and got the read/write errors.
> >> >
> >> > Any thoughts?
> >> >
> >> > Thanks,
> >> > Arun.
> >> >
> >> 
> >> 
> >> _______________________________________________
> >> Davinci-linux-open-source mailing list
> >> [e-mail]
> >> http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
> > _______________________________________________
> > Davinci-linux-open-source mailing list
> > [e-mail]
> > http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
> 
> _______________________________________________
> Davinci-linux-open-source mailing list
> [e-mail]
> http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
>

Patch

diff --git a/arch/arm/mach-davinci/dma.c b/arch/arm/mach-davinci/dma.c
index 1c60de6..c9c1a93 100644
--- a/arch/arm/mach-davinci/dma.c
+++ b/arch/arm/mach-davinci/dma.c
@@ -100,8 +100,6 @@ 
 #define EDMA_SHADOW0	0x2000	/* 4 regions shadowing global channels */
 #define EDMA_PARM	0x4000	/* 128 param entries */
 
-#define DAVINCI_DMA_3PCC_BASE	0x01C00000
-
 #define PARM_OFFSET(param_no)	(EDMA_PARM + ((param_no) << 5))
 
 #define EDMA_DCHMAP	0x0100  /* 64 registers */
@@ -1215,7 +1213,7 @@  static int __init edma_probe(struct platform_device *pdev)
 
 	len = r->end - r->start + 1;
 
-	r = request_mem_region(r->start, len, r->name);
+	r = request_mem_region(r->start, len, dev_name(&pdev->dev));
 	if (!r)
 		return -EBUSY;