* [PATCH] fix typo/compilation error on soc-dapm and at91-i2s
@ 2006-12-28 17:32 Raúl Sánchez Siles
2006-12-29 12:55 ` Liam Girdwood
2006-12-29 14:21 ` Seth Forshee
0 siblings, 2 replies; 10+ messages in thread
From: Raúl Sánchez Siles @ 2006-12-28 17:32 UTC (permalink / raw)
To: alsa-devel
[-- Attachment #1.1.1: Type: text/plain, Size: 604 bytes --]
Hello all:
I'm trying to use asoc for an at91 custom board and I had some problem
compiling the kernel with the v1.0.14rc1 alsa patch. The problem were in the
debug sections in two files.
I attach a patch to correct this problems. I'm new sending patches to alsa,
so if you think I did something wrong just let me know and I'll do my best.
Note: please put me in CC since i'm not subscribed to the list.
Thanks,
--
Raúl Sánchez Siles
Barracuda Systems S.L.
C/ Luxemburgo, 4 - Local
Pozuelo de Alarcón
28224 Madrid
Tlf.: +34 91 351 11 20
Fax: +34 91 352 54 44
[-- Attachment #1.1.2: typos_asoc.patch --]
[-- Type: text/x-diff, Size: 4423 bytes --]
# HG changeset patch
# User Raúl Sánchez Siles <rss@barracuda.es>
# Date 1167325268 -3600
# Node ID 80537c953b2dc530cc7bfb6bad13f2abe956fcc4
# Parent 1c7129898e61d6dc47634cab28dd83d750e06176
Solve typos/compilation problems for debug functions in soc-dapm and at91-i2s.
soc-dapm
·Fixed typo in soc-dapm.
at91-i2s
·Fixed typo in dai modes definition.
·Fixed struct member name in at91_ssc_info->ssc_state.
·Fixed compilation problem, ssc_state is bundled in at91_ssc_info.
diff -r 1c7129898e61 -r 80537c953b2d soc/at91/at91-i2s.c
--- a/soc/at91/at91-i2s.c Thu Dec 28 15:40:47 2006 +0100
+++ b/soc/at91/at91-i2s.c Thu Dec 28 18:01:08 2006 +0100
@@ -101,7 +101,7 @@ static struct snd_soc_dai_mode at91_i2s[
.pcmdir = AT91_I2S_DIR,
.flags = SND_SOC_DAI_BFS_DIV,
.fs = 250,
- .bfs SND_SOC_FSBD(5),
+ .bfs = SND_SOC_FSBD(5),
.priv = (13 << 16 | 23),
},
};
@@ -352,19 +352,19 @@ static int at91_i2s_suspend(struct platf
ssc_p = &ssc_info[dai->id];
/* Save the status register before disabling transmit and receive. */
- ssc_p->state->ssc_sr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_SR);
+ ssc_p->ssc_state.ssc_sr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_SR);
at91_ssc_write(ssc_p->ssc.base +
AT91_SSC_CR, AT91_SSC_TXDIS | AT91_SSC_RXDIS);
/* Save the current interrupt mask, then disable unmasked interrupts. */
- ssc_p->state->ssc_imr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_IMR);
- at91_ssc_write(ssc_p->ssc.base + AT91_SSC_IDR, ssc_p->state->ssc_imr);
-
- ssc_p->state->ssc_cmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_CMR);
- ssc_p->state->ssc_rcmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
- ssc_p->state->ssc_rfmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
- ssc_p->state->ssc_tcmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
- ssc_p->state->ssc_tfmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
+ ssc_p->ssc_state.ssc_imr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_IMR);
+ at91_ssc_write(ssc_p->ssc.base + AT91_SSC_IDR, ssc_p->ssc_state.ssc_imr);
+
+ ssc_p->ssc_state.ssc_cmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_CMR);
+ ssc_p->ssc_state.ssc_rcmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
+ ssc_p->ssc_state.ssc_rfmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
+ ssc_p->ssc_state.ssc_tcmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
+ ssc_p->ssc_state.ssc_tfmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
return 0;
}
@@ -380,17 +380,17 @@ static int at91_i2s_resume(struct platfo
ssc_p = &ssc_info[dai->id];
- at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->state->ssc_tfmr);
- at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->state->ssc_tcmr);
- at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->state->ssc_rfmr);
- at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->state->ssc_rcmr);
- at91_ssc_write(ssc_p->ssc.base + AT91_SSC_CMR, ssc_p->state->ssc_cmr);
-
- at91_ssc_write(ssc_p->ssc.base + AT91_SSC_IER, ssc_p->state->ssc_imr);
+ at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->ssc_state.ssc_tfmr);
+ at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->ssc_state.ssc_tcmr);
+ at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->ssc_state.ssc_rfmr);
+ at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->ssc_state.ssc_rcmr);
+ at91_ssc_write(ssc_p->ssc.base + AT91_SSC_CMR, ssc_p->ssc_state.ssc_cmr);
+
+ at91_ssc_write(ssc_p->ssc.base + AT91_SSC_IER, ssc_p->ssc_state.ssc_imr);
at91_ssc_write(ssc_p->ssc.base + AT91_SSC_CR,
- ((ssc_p->state->ssc_sr & AT91_SSC_RXENA) ? AT91_SSC_RXEN : 0) |
- ((ssc_p->state->ssc_sr & AT91_SSC_TXENA) ? AT91_SSC_TXEN : 0));
+ ((ssc_p->ssc_state.ssc_sr & AT91_SSC_RXENA) ? AT91_SSC_RXEN : 0) |
+ ((ssc_p->ssc_state.ssc_sr & AT91_SSC_TXENA) ? AT91_SSC_TXEN : 0));
return 0;
}
diff -r 1c7129898e61 -r 80537c953b2d soc/soc-dapm.c
--- a/soc/soc-dapm.c Thu Dec 28 15:40:47 2006 +0100
+++ b/soc/soc-dapm.c Thu Dec 28 18:01:08 2006 +0100
@@ -651,7 +651,7 @@ static void dbg_dump_dapm(struct snd_soc
p->source->name);
}
list_for_each_entry(p, &w->sinks, list_source) {
- p = list_entry(lp, struct snd_soc_dapm_path, list_source);
+ p = list_entry(p, struct snd_soc_dapm_path, list_source);
if (p->connect)
printk(" out %s %s\n", p->name ? p->name : "static",
p->sink->name);
[-- Attachment #1.2: Type: application/pgp-signature, Size: 189 bytes --]
[-- Attachment #2: Type: text/plain, Size: 347 bytes --]
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
[-- Attachment #3: Type: text/plain, Size: 161 bytes --]
_______________________________________________
Alsa-devel mailing list
Alsa-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/alsa-devel
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH] fix typo/compilation error on soc-dapm and at91-i2s
2006-12-28 17:32 [PATCH] fix typo/compilation error on soc-dapm and at91-i2s Raúl Sánchez Siles
@ 2006-12-29 12:55 ` Liam Girdwood
2006-12-29 13:16 ` Frank Mandarino
2006-12-29 14:16 ` Liam Girdwood
2006-12-29 14:21 ` Seth Forshee
1 sibling, 2 replies; 10+ messages in thread
From: Liam Girdwood @ 2006-12-29 12:55 UTC (permalink / raw)
To: Raúl Sánchez Siles; +Cc: alsa-devel, Frank Mandarino
On Thu, 2006-12-28 at 18:32 +0100, Raúl Sánchez Siles wrote:
> Hello all:
>
> I'm trying to use asoc for an at91 custom board and I had some problem
> compiling the kernel with the v1.0.14rc1 alsa patch. The problem were in the
> debug sections in two files.
>
> I attach a patch to correct this problems. I'm new sending patches to alsa,
> so if you think I did something wrong just let me know and I'll do my best.
>
Thanks, this looks fine. Applied to my tree.
Fwiw, Frank sent me an AT91 bug fix last week, although due to other
work, I've not had a chance to apply or submit yet.
Frank, any chance you can submit. It's in my patch inbox at the office
and I won't be back until the 3rd.
Thanks
Liam
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Alsa-devel mailing list
Alsa-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/alsa-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] fix typo/compilation error on soc-dapm and at91-i2s
2006-12-29 12:55 ` Liam Girdwood
@ 2006-12-29 13:16 ` Frank Mandarino
2006-12-29 13:31 ` Liam Girdwood
2006-12-29 14:16 ` Liam Girdwood
1 sibling, 1 reply; 10+ messages in thread
From: Frank Mandarino @ 2006-12-29 13:16 UTC (permalink / raw)
To: Liam Girdwood; +Cc: alsa-devel, Raúl Sánchez Siles
Liam Girdwood wrote:
> On Thu, 2006-12-28 at 18:32 +0100, Raúl Sánchez Siles wrote:
>> Hello all:
>>
>> I'm trying to use asoc for an at91 custom board and I had some problem
>> compiling the kernel with the v1.0.14rc1 alsa patch. The problem were in the
>> debug sections in two files.
>>
>> I attach a patch to correct this problems. I'm new sending patches to alsa,
>> so if you think I did something wrong just let me know and I'll do my best.
>>
>
> Thanks, this looks fine. Applied to my tree.
>
> Fwiw, Frank sent me an AT91 bug fix last week, although due to other
> work, I've not had a chance to apply or submit yet.
>
> Frank, any chance you can submit. It's in my patch inbox at the office
> and I won't be back until the 3rd.
>
> Thanks
>
> Liam
I am out of the office until the 2nd, but I should be able to submit
from home.
Are you referring to the patch I sent you last week, or Raúl's patch, or
both?
(Raúl: thanks for the fixes to at91-i2s.c. I can't believe I was that
careless!)
../fam
--
Frank Mandarino fmandarino(a)endrelia.com
Endrelia Technologies Inc.
Toronto, Ontario, Canada
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Alsa-devel mailing list
Alsa-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/alsa-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] fix typo/compilation error on soc-dapm and at91-i2s
2006-12-29 13:16 ` Frank Mandarino
@ 2006-12-29 13:31 ` Liam Girdwood
2006-12-29 13:42 ` Frank Mandarino
0 siblings, 1 reply; 10+ messages in thread
From: Liam Girdwood @ 2006-12-29 13:31 UTC (permalink / raw)
To: Frank Mandarino; +Cc: alsa-devel, Raúl Sánchez Siles
On Fri, 2006-12-29 at 08:16 -0500, Frank Mandarino wrote:
> Liam Girdwood wrote:
> > Frank, any chance you can submit. It's in my patch inbox at the office
> > and I won't be back until the 3rd.
> >
> > Thanks
> >
> > Liam
>
> I am out of the office until the 2nd, but I should be able to submit
> from home.
>
> Are you referring to the patch I sent you last week, or Raúl's patch, or
> both?
Sorry, I was meaning your patch from last week.
Cheers
Liam
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Alsa-devel mailing list
Alsa-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/alsa-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] fix typo/compilation error on soc-dapm and at91-i2s
2006-12-29 13:31 ` Liam Girdwood
@ 2006-12-29 13:42 ` Frank Mandarino
0 siblings, 0 replies; 10+ messages in thread
From: Frank Mandarino @ 2006-12-29 13:42 UTC (permalink / raw)
To: Liam Girdwood; +Cc: alsa-devel, Raúl Sánchez Siles
Liam Girdwood wrote:
> On Fri, 2006-12-29 at 08:16 -0500, Frank Mandarino wrote:
>> Liam Girdwood wrote:
>
>>> Frank, any chance you can submit. It's in my patch inbox at the office
>>> and I won't be back until the 3rd.
>>>
>>> Thanks
>>>
>>> Liam
>> I am out of the office until the 2nd, but I should be able to submit
>> from home.
>>
>> Are you referring to the patch I sent you last week, or Raúl's patch, or
>> both?
>
> Sorry, I was meaning your patch from last week.
>
> Cheers
>
> Liam
No problem. I'll try to get it done today.
Regards,
../fam
--
Frank Mandarino fmandarino(a)endrelia.com
Endrelia Technologies Inc.
Toronto, Ontario, Canada
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Alsa-devel mailing list
Alsa-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/alsa-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] fix typo/compilation error on soc-dapm and at91-i2s
2006-12-29 12:55 ` Liam Girdwood
2006-12-29 13:16 ` Frank Mandarino
@ 2006-12-29 14:16 ` Liam Girdwood
2007-01-05 11:41 ` Raúl Sánchez Siles
1 sibling, 1 reply; 10+ messages in thread
From: Liam Girdwood @ 2006-12-29 14:16 UTC (permalink / raw)
To: Raúl Sánchez Siles; +Cc: alsa-devel, Frank Mandarino
[-- Attachment #1: Type: text/plain, Size: 727 bytes --]
On Fri, 2006-12-29 at 12:55 +0000, Liam Girdwood wrote:
> On Thu, 2006-12-28 at 18:32 +0100, Raúl Sánchez Siles wrote:
> > Hello all:
> >
> > I'm trying to use asoc for an at91 custom board and I had some problem
> > compiling the kernel with the v1.0.14rc1 alsa patch. The problem were in the
> > debug sections in two files.
> >
> > I attach a patch to correct this problems. I'm new sending patches to alsa,
> > so if you think I did something wrong just let me know and I'll do my best.
> >
>
> Thanks, this looks fine. Applied to my tree.
I've made the following attached alteration the the DAPM debug section
as the list_entry() is not needed. Can you re submit ?
Thanks
Liam
[-- Attachment #2: dapm-debug.patch --]
[-- Type: text/x-patch, Size: 459 bytes --]
diff -r 4eae1a19406e soc/soc-dapm.c
--- a/soc/soc-dapm.c Thu Dec 28 13:56:48 2006 +0100
+++ b/soc/soc-dapm.c Fri Dec 29 14:11:27 2006 +0000
@@ -651,7 +651,6 @@ static void dbg_dump_dapm(struct snd_soc
p->source->name);
}
list_for_each_entry(p, &w->sinks, list_source) {
- p = list_entry(lp, struct snd_soc_dapm_path, list_source);
if (p->connect)
printk(" out %s %s\n", p->name ? p->name : "static",
p->sink->name);
[-- Attachment #3: Type: text/plain, Size: 347 bytes --]
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
[-- Attachment #4: Type: text/plain, Size: 161 bytes --]
_______________________________________________
Alsa-devel mailing list
Alsa-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/alsa-devel
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH] fix typo/compilation error on soc-dapm and at91-i2s
2006-12-29 14:16 ` Liam Girdwood
@ 2007-01-05 11:41 ` Raúl Sánchez Siles
2007-01-05 13:55 ` Liam Girdwood
2007-01-08 11:13 ` Takashi Iwai
0 siblings, 2 replies; 10+ messages in thread
From: Raúl Sánchez Siles @ 2007-01-05 11:41 UTC (permalink / raw)
To: alsa-devel
[-- Attachment #1: Type: text/plain, Size: 768 bytes --]
Liam Girdwood wrote:
> On Fri, 2006-12-29 at 12:55 +0000, Liam Girdwood wrote:
>> On Thu, 2006-12-28 at 18:32 +0100, Raúl Sánchez Siles wrote:
>> > Hello all:
>> >
>> > I'm trying to use asoc for an at91 custom board and I had some
>> > problem
>> > compiling the kernel with the v1.0.14rc1 alsa patch. The problem were
>> > in the debug sections in two files.
>> >
>>
>> Thanks, this looks fine. Applied to my tree.
>
> I've made the following attached alteration the the DAPM debug section
> as the list_entry() is not needed. Can you re submit ?
>
> Thanks
>
> Liam
After some newbie fights with mercurial I get to do it. Find it attached.
Please, let me know if you need anything else.
Regards,
--
Raúl Sánchez Siles
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: typos_asoc_b.patch --]
[-- Type: text/x-diff; name="typos_asoc_b.patch", Size: 4465 bytes --]
# HG changeset patch
# User Raúl Sánchez Siles <rss@barracuda.es>
# Date 1167996612 -3600
# Node ID 589751eead4cd109a78bd9f0ffc85d0b95d2e03c
# Parent 1c7129898e61d6dc47634cab28dd83d750e06176
Solve typos/compilation problems for debug functions in soc-dapm and at91-i2s.
soc-dapm
·Removed list_for_each since the loop is list_for_each_entry() and
not list_for_each(). Thanks to Liam Girdwood and Seth Forshee.
at91-i2s
·Fixed typo in dai modes definition.
·Fixed struct member name in at91_ssc_info->ssc_state.
·Fixed compilation problem, ssc_state is bundled in at91_ssc_info.
diff -r 1c7129898e61 -r 589751eead4c soc/at91/at91-i2s.c
--- a/soc/at91/at91-i2s.c Thu Dec 28 15:40:47 2006 +0100
+++ b/soc/at91/at91-i2s.c Fri Jan 05 12:30:12 2007 +0100
@@ -101,7 +101,7 @@ static struct snd_soc_dai_mode at91_i2s[
.pcmdir = AT91_I2S_DIR,
.flags = SND_SOC_DAI_BFS_DIV,
.fs = 250,
- .bfs SND_SOC_FSBD(5),
+ .bfs = SND_SOC_FSBD(5),
.priv = (13 << 16 | 23),
},
};
@@ -352,19 +352,19 @@ static int at91_i2s_suspend(struct platf
ssc_p = &ssc_info[dai->id];
/* Save the status register before disabling transmit and receive. */
- ssc_p->state->ssc_sr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_SR);
+ ssc_p->ssc_state.ssc_sr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_SR);
at91_ssc_write(ssc_p->ssc.base +
AT91_SSC_CR, AT91_SSC_TXDIS | AT91_SSC_RXDIS);
/* Save the current interrupt mask, then disable unmasked interrupts. */
- ssc_p->state->ssc_imr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_IMR);
- at91_ssc_write(ssc_p->ssc.base + AT91_SSC_IDR, ssc_p->state->ssc_imr);
-
- ssc_p->state->ssc_cmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_CMR);
- ssc_p->state->ssc_rcmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
- ssc_p->state->ssc_rfmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
- ssc_p->state->ssc_tcmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
- ssc_p->state->ssc_tfmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
+ ssc_p->ssc_state.ssc_imr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_IMR);
+ at91_ssc_write(ssc_p->ssc.base + AT91_SSC_IDR, ssc_p->ssc_state.ssc_imr);
+
+ ssc_p->ssc_state.ssc_cmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_CMR);
+ ssc_p->ssc_state.ssc_rcmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
+ ssc_p->ssc_state.ssc_rfmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
+ ssc_p->ssc_state.ssc_tcmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
+ ssc_p->ssc_state.ssc_tfmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
return 0;
}
@@ -380,17 +380,17 @@ static int at91_i2s_resume(struct platfo
ssc_p = &ssc_info[dai->id];
- at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->state->ssc_tfmr);
- at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->state->ssc_tcmr);
- at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->state->ssc_rfmr);
- at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->state->ssc_rcmr);
- at91_ssc_write(ssc_p->ssc.base + AT91_SSC_CMR, ssc_p->state->ssc_cmr);
-
- at91_ssc_write(ssc_p->ssc.base + AT91_SSC_IER, ssc_p->state->ssc_imr);
+ at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->ssc_state.ssc_tfmr);
+ at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->ssc_state.ssc_tcmr);
+ at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->ssc_state.ssc_rfmr);
+ at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->ssc_state.ssc_rcmr);
+ at91_ssc_write(ssc_p->ssc.base + AT91_SSC_CMR, ssc_p->ssc_state.ssc_cmr);
+
+ at91_ssc_write(ssc_p->ssc.base + AT91_SSC_IER, ssc_p->ssc_state.ssc_imr);
at91_ssc_write(ssc_p->ssc.base + AT91_SSC_CR,
- ((ssc_p->state->ssc_sr & AT91_SSC_RXENA) ? AT91_SSC_RXEN : 0) |
- ((ssc_p->state->ssc_sr & AT91_SSC_TXENA) ? AT91_SSC_TXEN : 0));
+ ((ssc_p->ssc_state.ssc_sr & AT91_SSC_RXENA) ? AT91_SSC_RXEN : 0) |
+ ((ssc_p->ssc_state.ssc_sr & AT91_SSC_TXENA) ? AT91_SSC_TXEN : 0));
return 0;
}
diff -r 1c7129898e61 -r 589751eead4c soc/soc-dapm.c
--- a/soc/soc-dapm.c Thu Dec 28 15:40:47 2006 +0100
+++ b/soc/soc-dapm.c Fri Jan 05 12:30:12 2007 +0100
@@ -651,7 +651,6 @@ static void dbg_dump_dapm(struct snd_soc
p->source->name);
}
list_for_each_entry(p, &w->sinks, list_source) {
- p = list_entry(lp, struct snd_soc_dapm_path, list_source);
if (p->connect)
printk(" out %s %s\n", p->name ? p->name : "static",
p->sink->name);
[-- Attachment #3: Type: text/plain, Size: 347 bytes --]
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
[-- Attachment #4: Type: text/plain, Size: 161 bytes --]
_______________________________________________
Alsa-devel mailing list
Alsa-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/alsa-devel
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH] fix typo/compilation error on soc-dapm and at91-i2s
2007-01-05 11:41 ` Raúl Sánchez Siles
@ 2007-01-05 13:55 ` Liam Girdwood
2007-01-08 11:13 ` Takashi Iwai
1 sibling, 0 replies; 10+ messages in thread
From: Liam Girdwood @ 2007-01-05 13:55 UTC (permalink / raw)
To: rss; +Cc: Seth Forshee, alsa-devel
On Fri, 2007-01-05 at 12:41 +0100, Raúl Sánchez Siles wrote:
> Liam Girdwood wrote:
>
> > On Fri, 2006-12-29 at 12:55 +0000, Liam Girdwood wrote:
> >> On Thu, 2006-12-28 at 18:32 +0100, Raúl Sánchez Siles wrote:
> >> > Hello all:
> >> >
> >> > I'm trying to use asoc for an at91 custom board and I had some
> >> > problem
> >> > compiling the kernel with the v1.0.14rc1 alsa patch. The problem were
> >> > in the debug sections in two files.
> >> >
> >>
> >> Thanks, this looks fine. Applied to my tree.
> >
> > I've made the following attached alteration the the DAPM debug section
> > as the list_entry() is not needed. Can you re submit ?
> >
> > Thanks
> >
> > Liam
>
> After some newbie fights with mercurial I get to do it. Find it attached.
> Please, let me know if you need anything else.
>
Thanks - The DAPM list_entry() fix that I attached in my last message
was submitted by Seth in an earlier email to me.
Fwiw, I've added you to the sign off list. (It's common practice to sign
patches as your own work before submitting to the kernel.)
Signed-off-by: Seth Forshee <seth.forshee@gmail.com>
Signed-off-by: Raúl Sánchez Siles <rss@barracuda.es>
Liam
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Alsa-devel mailing list
Alsa-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/alsa-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] fix typo/compilation error on soc-dapm and at91-i2s
2007-01-05 11:41 ` Raúl Sánchez Siles
2007-01-05 13:55 ` Liam Girdwood
@ 2007-01-08 11:13 ` Takashi Iwai
1 sibling, 0 replies; 10+ messages in thread
From: Takashi Iwai @ 2007-01-08 11:13 UTC (permalink / raw)
To: rss; +Cc: alsa-devel
At Fri, 05 Jan 2007 12:41:53 +0100,
Raúl Sánchez Siles wrote:
>
> Liam Girdwood wrote:
>
> > On Fri, 2006-12-29 at 12:55 +0000, Liam Girdwood wrote:
> >> On Thu, 2006-12-28 at 18:32 +0100, Raúl Sánchez Siles wrote:
> >> > Hello all:
> >> >
> >> > I'm trying to use asoc for an at91 custom board and I had some
> >> > problem
> >> > compiling the kernel with the v1.0.14rc1 alsa patch. The problem were
> >> > in the debug sections in two files.
> >> >
> >>
> >> Thanks, this looks fine. Applied to my tree.
> >
> > I've made the following attached alteration the the DAPM debug section
> > as the list_entry() is not needed. Can you re submit ?
> >
> > Thanks
> >
> > Liam
>
> After some newbie fights with mercurial I get to do it. Find it attached.
> Please, let me know if you need anything else.
Thanks, applied to ALSA HG tree now.
At the next time, don't forget give your sign-off, too.
Takashi
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] fix typo/compilation error on soc-dapm and at91-i2s
2006-12-28 17:32 [PATCH] fix typo/compilation error on soc-dapm and at91-i2s Raúl Sánchez Siles
2006-12-29 12:55 ` Liam Girdwood
@ 2006-12-29 14:21 ` Seth Forshee
1 sibling, 0 replies; 10+ messages in thread
From: Seth Forshee @ 2006-12-29 14:21 UTC (permalink / raw)
To: Raúl Sánchez Siles; +Cc: alsa-devel
On 12/28/06, Raúl Sánchez Siles <rss@barracuda.es> wrote:
> Hello all:
>
> I'm trying to use asoc for an at91 custom board and I had some problem
> compiling the kernel with the v1.0.14rc1 alsa patch. The problem were in the
> debug sections in two files.
>
> I attach a patch to correct this problems. I'm new sending patches to alsa,
> so if you think I did something wrong just let me know and I'll do my best.
>
I think that the line you modified in soc-dapm.c can be removed
completely, since the loop is list_for_each_entry() and not
list_for_each(). The assignment to p in the loop is redundant.
Cheers,
Seth
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2007-01-08 11:13 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-12-28 17:32 [PATCH] fix typo/compilation error on soc-dapm and at91-i2s Raúl Sánchez Siles
2006-12-29 12:55 ` Liam Girdwood
2006-12-29 13:16 ` Frank Mandarino
2006-12-29 13:31 ` Liam Girdwood
2006-12-29 13:42 ` Frank Mandarino
2006-12-29 14:16 ` Liam Girdwood
2007-01-05 11:41 ` Raúl Sánchez Siles
2007-01-05 13:55 ` Liam Girdwood
2007-01-08 11:13 ` Takashi Iwai
2006-12-29 14:21 ` Seth Forshee
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.