Patch "omap: zoom: add mmc3/wl1271 device support" in the
wireless tree still uses .wires in struct omap2_hsmmc_info.
.wires has now been replaced with .caps in patch "omap: mmc:
extended to pass host capabilities from board file" in the
OMAP tree.
This causes linux-next as of 20101001 build to break as
below. Fix this.
CC arch/arm/mach-omap2/board-zoom-peripherals.o
arch/arm/mach-omap2/board-zoom-peripherals.c:217: error: unknown field 'wires' specified in initializer
make[1]: *** [arch/arm/mach-omap2/board-zoom-peripherals.o] Error 1
make: *** [arch/arm/mach-omap2] Error 2
Signed-off-by: Anand Gadiyar <[email protected]>
Cc: Ohad Ben-Cohen <[email protected]>
Cc: Tony Lindgren <[email protected]>
---
arch/arm/mach-omap2/board-zoom-peripherals.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-2.6/arch/arm/mach-omap2/board-zoom-peripherals.c
===================================================================
--- linux-2.6.orig/arch/arm/mach-omap2/board-zoom-peripherals.c
+++ linux-2.6/arch/arm/mach-omap2/board-zoom-peripherals.c
@@ -214,7 +214,7 @@ static struct omap2_hsmmc_info mmc[] __i
{
.name = "wl1271",
.mmc = 3,
- .wires = 4,
+ .caps = MMC_CAP_4_BIT_DATA,
.gpio_wp = -EINVAL,
.gpio_cd = -EINVAL,
.nonremovable = true,
On Tue, 2010-10-05 at 13:53 +0200, ext Luciano Coelho wrote:
> On Sat, 2010-10-02 at 01:10 +0200, ext Tony Lindgren wrote:
> > * Anand Gadiyar <[email protected]> [101001 13:25]:
> > > Patch "omap: zoom: add mmc3/wl1271 device support" in the
> > > wireless tree still uses .wires in struct omap2_hsmmc_info.
> > > .wires has now been replaced with .caps in patch "omap: mmc:
> > > extended to pass host capabilities from board file" in the
> > > OMAP tree.
> > >
> > > This causes linux-next as of 20101001 build to break as
> > > below. Fix this.
> > >
> > > CC arch/arm/mach-omap2/board-zoom-peripherals.o
> > > arch/arm/mach-omap2/board-zoom-peripherals.c:217: error: unknown field 'wires' specified in initializer
> > > make[1]: *** [arch/arm/mach-omap2/board-zoom-peripherals.o] Error 1
> > > make: *** [arch/arm/mach-omap2] Error 2
> >
> > Can you guys please queue this via the wireless tree along with
> > the other wl1271 patches?
> >
> > Acked-by: Tony Lindgren <[email protected]>
>
> I can apply this to the wl12xx tree. I just need John's confirmation.
>
> The pull request I sent to John last week is still pending. I don't
> know if it is possible to substitute it for a newer one with more
> patches (and still try to make it to 2.6.37). What do you think, John?
Damn, for some reason I had a bug in John's email in my contact book.
Now sending to the correct email address.
--
Cheers,
Luca.
On Tue, Oct 05, 2010 at 11:39:47PM +0300, Luciano Coelho wrote:
> On Tue, 2010-10-05 at 15:19 +0200, ext Luciano Coelho wrote:
> > On Tue, 2010-10-05 at 14:07 +0200, ext Luciano Coelho wrote:
> > > On Tue, 2010-10-05 at 13:53 +0200, ext Luciano Coelho wrote:
> > > > On Sat, 2010-10-02 at 01:10 +0200, ext Tony Lindgren wrote:
> > > > > * Anand Gadiyar <[email protected]> [101001 13:25]:
> > > > > > Patch "omap: zoom: add mmc3/wl1271 device support" in the
> > > > > > wireless tree still uses .wires in struct omap2_hsmmc_info.
> > > > > > .wires has now been replaced with .caps in patch "omap: mmc:
> > > > > > extended to pass host capabilities from board file" in the
> > > > > > OMAP tree.
> > > > > >
> > > > > > This causes linux-next as of 20101001 build to break as
> > > > > > below. Fix this.
> > > > > >
> > > > > > CC arch/arm/mach-omap2/board-zoom-peripherals.o
> > > > > > arch/arm/mach-omap2/board-zoom-peripherals.c:217: error: unknown field 'wires' specified in initializer
> > > > > > make[1]: *** [arch/arm/mach-omap2/board-zoom-peripherals.o] Error 1
> > > > > > make: *** [arch/arm/mach-omap2] Error 2
> > > > >
> > > > > Can you guys please queue this via the wireless tree along with
> > > > > the other wl1271 patches?
> > > > >
> > > > > Acked-by: Tony Lindgren <[email protected]>
> > > >
> > > > I can apply this to the wl12xx tree. I just need John's confirmation.
> > > >
> > > > The pull request I sent to John last week is still pending. I don't
> > > > know if it is possible to substitute it for a newer one with more
> > > > patches (and still try to make it to 2.6.37). What do you think, John?
> > >
> > > Damn, for some reason I had a bug in John's email in my contact book.
> > > Now sending to the correct email address.
> >
> > Applied to the wl12xx tree. I'll send a new replacement pull to John
> > today, including this patch. Thanks.
>
> Hmmm... We got a problem here. This patch breaks builds when we *don't*
> have "omap: mmc extended to pass host capabilities from board file". We
> don't have that on wireless-next yet, so builds with zoom boards
> selected are broken.
>
> Any ideas on how to solve this dilemma? I guess the proper way to handle
> this would be to make the changes proposed in this patch when merging
> instead of having a normal commit for it, wouldn't it?
Just cherry-pick that change into the branch of your tree that I do
_not_ pull from. I presume that it is already available in linux-next?
John
--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.
On Sat, 2010-10-02 at 01:10 +0200, ext Tony Lindgren wrote:
> * Anand Gadiyar <[email protected]> [101001 13:25]:
> > Patch "omap: zoom: add mmc3/wl1271 device support" in the
> > wireless tree still uses .wires in struct omap2_hsmmc_info.
> > .wires has now been replaced with .caps in patch "omap: mmc:
> > extended to pass host capabilities from board file" in the
> > OMAP tree.
> >
> > This causes linux-next as of 20101001 build to break as
> > below. Fix this.
> >
> > CC arch/arm/mach-omap2/board-zoom-peripherals.o
> > arch/arm/mach-omap2/board-zoom-peripherals.c:217: error: unknown field 'wires' specified in initializer
> > make[1]: *** [arch/arm/mach-omap2/board-zoom-peripherals.o] Error 1
> > make: *** [arch/arm/mach-omap2] Error 2
>
> Can you guys please queue this via the wireless tree along with
> the other wl1271 patches?
>
> Acked-by: Tony Lindgren <[email protected]>
I can apply this to the wl12xx tree. I just need John's confirmation.
The pull request I sent to John last week is still pending. I don't
know if it is possible to substitute it for a newer one with more
patches (and still try to make it to 2.6.37). What do you think, John?
--
Cheers,
Luca.
On Wed, 2010-10-06 at 17:30 +0200, ext John W. Linville wrote:
> On Wed, Oct 06, 2010 at 06:27:49PM +0300, Luciano Coelho wrote:
> > On Wed, 2010-10-06 at 16:01 +0200, ext Gadiyar, Anand wrote:
> > > >> Hmmm... We got a problem here. This patch breaks builds when we *don't*
> > > >> have "omap: mmc extended to pass host capabilities from board file". We
> > > >> don't have that on wireless-next yet, so builds with zoom boards
> > > >> selected are broken.
> > > >>
> > > >> Any ideas on how to solve this dilemma? I guess the proper way to handle
> > > >> this would be to make the changes proposed in this patch when merging
> > > >> instead of having a normal commit for it, wouldn't it?
> > > >
> > > > Just cherry-pick that change into the branch of your tree that I do
> > > > _not_ pull from. I presume that it is already available in linux-next?
> > > >
> > >
> > > Yup - both patches are in linux-next; that's where we noticed the build break.
> >
> > Ok, I hope the patch applies cleanly in our trees.
> >
> > John, don't you want to do the cherry-pick on your wireless-testing
> > then? If you do it, I can "inherit" that, because I pull from it into my
> > "testing" branch (wl12xx/master). At the moment, w-t is broken too.
>
> OK, that's fine -- do you have the commit ID and the tree that has it?
Stephen's linux-net, commit 3a63833ec3002816a759a49ebda4e229c089114e.
http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git;a=commit;h=3a63833ec3002816a759a49ebda4e229c089114e
--
Cheers,
Luca.
* Anand Gadiyar <[email protected]> [101001 13:25]:
> Patch "omap: zoom: add mmc3/wl1271 device support" in the
> wireless tree still uses .wires in struct omap2_hsmmc_info.
> .wires has now been replaced with .caps in patch "omap: mmc:
> extended to pass host capabilities from board file" in the
> OMAP tree.
>
> This causes linux-next as of 20101001 build to break as
> below. Fix this.
>
> CC arch/arm/mach-omap2/board-zoom-peripherals.o
> arch/arm/mach-omap2/board-zoom-peripherals.c:217: error: unknown field 'wires' specified in initializer
> make[1]: *** [arch/arm/mach-omap2/board-zoom-peripherals.o] Error 1
> make: *** [arch/arm/mach-omap2] Error 2
Can you guys please queue this via the wireless tree along with
the other wl1271 patches?
Acked-by: Tony Lindgren <[email protected]>
> Signed-off-by: Anand Gadiyar <[email protected]>
> Cc: Ohad Ben-Cohen <[email protected]>
> Cc: Tony Lindgren <[email protected]>
> ---
> arch/arm/mach-omap2/board-zoom-peripherals.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: linux-2.6/arch/arm/mach-omap2/board-zoom-peripherals.c
> ===================================================================
> --- linux-2.6.orig/arch/arm/mach-omap2/board-zoom-peripherals.c
> +++ linux-2.6/arch/arm/mach-omap2/board-zoom-peripherals.c
> @@ -214,7 +214,7 @@ static struct omap2_hsmmc_info mmc[] __i
> {
> .name = "wl1271",
> .mmc = 3,
> - .wires = 4,
> + .caps = MMC_CAP_4_BIT_DATA,
> .gpio_wp = -EINVAL,
> .gpio_cd = -EINVAL,
> .nonremovable = true,
>> Hmmm... We got a problem here. ?This patch breaks builds when we *don't*
>> have "omap: mmc extended to pass host capabilities from board file". ?We
>> don't have that on wireless-next yet, so builds with zoom boards
>> selected are broken.
>>
>> Any ideas on how to solve this dilemma? I guess the proper way to handle
>> this would be to make the changes proposed in this patch when merging
>> instead of having a normal commit for it, wouldn't it?
>
> Just cherry-pick that change into the branch of your tree that I do
> _not_ pull from. ?I presume that it is already available in linux-next?
>
Yup - both patches are in linux-next; that's where we noticed the build break.
- Anand
On Wed, 2010-10-06 at 16:01 +0200, ext Gadiyar, Anand wrote:
> >> Hmmm... We got a problem here. This patch breaks builds when we *don't*
> >> have "omap: mmc extended to pass host capabilities from board file". We
> >> don't have that on wireless-next yet, so builds with zoom boards
> >> selected are broken.
> >>
> >> Any ideas on how to solve this dilemma? I guess the proper way to handle
> >> this would be to make the changes proposed in this patch when merging
> >> instead of having a normal commit for it, wouldn't it?
> >
> > Just cherry-pick that change into the branch of your tree that I do
> > _not_ pull from. I presume that it is already available in linux-next?
> >
>
> Yup - both patches are in linux-next; that's where we noticed the build break.
Ok, I hope the patch applies cleanly in our trees.
John, don't you want to do the cherry-pick on your wireless-testing
then? If you do it, I can "inherit" that, because I pull from it into my
"testing" branch (wl12xx/master). At the moment, w-t is broken too.
--
Cheers,
Luca.
On Wed, Oct 06, 2010 at 06:27:49PM +0300, Luciano Coelho wrote:
> On Wed, 2010-10-06 at 16:01 +0200, ext Gadiyar, Anand wrote:
> > >> Hmmm... We got a problem here. This patch breaks builds when we *don't*
> > >> have "omap: mmc extended to pass host capabilities from board file". We
> > >> don't have that on wireless-next yet, so builds with zoom boards
> > >> selected are broken.
> > >>
> > >> Any ideas on how to solve this dilemma? I guess the proper way to handle
> > >> this would be to make the changes proposed in this patch when merging
> > >> instead of having a normal commit for it, wouldn't it?
> > >
> > > Just cherry-pick that change into the branch of your tree that I do
> > > _not_ pull from. I presume that it is already available in linux-next?
> > >
> >
> > Yup - both patches are in linux-next; that's where we noticed the build break.
>
> Ok, I hope the patch applies cleanly in our trees.
>
> John, don't you want to do the cherry-pick on your wireless-testing
> then? If you do it, I can "inherit" that, because I pull from it into my
> "testing" branch (wl12xx/master). At the moment, w-t is broken too.
OK, that's fine -- do you have the commit ID and the tree that has it?
John
--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.
On Tue, 2010-10-05 at 14:07 +0200, ext Luciano Coelho wrote:
> On Tue, 2010-10-05 at 13:53 +0200, ext Luciano Coelho wrote:
> > On Sat, 2010-10-02 at 01:10 +0200, ext Tony Lindgren wrote:
> > > * Anand Gadiyar <[email protected]> [101001 13:25]:
> > > > Patch "omap: zoom: add mmc3/wl1271 device support" in the
> > > > wireless tree still uses .wires in struct omap2_hsmmc_info.
> > > > .wires has now been replaced with .caps in patch "omap: mmc:
> > > > extended to pass host capabilities from board file" in the
> > > > OMAP tree.
> > > >
> > > > This causes linux-next as of 20101001 build to break as
> > > > below. Fix this.
> > > >
> > > > CC arch/arm/mach-omap2/board-zoom-peripherals.o
> > > > arch/arm/mach-omap2/board-zoom-peripherals.c:217: error: unknown field 'wires' specified in initializer
> > > > make[1]: *** [arch/arm/mach-omap2/board-zoom-peripherals.o] Error 1
> > > > make: *** [arch/arm/mach-omap2] Error 2
> > >
> > > Can you guys please queue this via the wireless tree along with
> > > the other wl1271 patches?
> > >
> > > Acked-by: Tony Lindgren <[email protected]>
> >
> > I can apply this to the wl12xx tree. I just need John's confirmation.
> >
> > The pull request I sent to John last week is still pending. I don't
> > know if it is possible to substitute it for a newer one with more
> > patches (and still try to make it to 2.6.37). What do you think, John?
>
> Damn, for some reason I had a bug in John's email in my contact book.
> Now sending to the correct email address.
Applied to the wl12xx tree. I'll send a new replacement pull to John
today, including this patch. Thanks.
--
Cheers,
Luca.
On Tue, 2010-10-05 at 15:19 +0200, ext Luciano Coelho wrote:
> On Tue, 2010-10-05 at 14:07 +0200, ext Luciano Coelho wrote:
> > On Tue, 2010-10-05 at 13:53 +0200, ext Luciano Coelho wrote:
> > > On Sat, 2010-10-02 at 01:10 +0200, ext Tony Lindgren wrote:
> > > > * Anand Gadiyar <[email protected]> [101001 13:25]:
> > > > > Patch "omap: zoom: add mmc3/wl1271 device support" in the
> > > > > wireless tree still uses .wires in struct omap2_hsmmc_info.
> > > > > .wires has now been replaced with .caps in patch "omap: mmc:
> > > > > extended to pass host capabilities from board file" in the
> > > > > OMAP tree.
> > > > >
> > > > > This causes linux-next as of 20101001 build to break as
> > > > > below. Fix this.
> > > > >
> > > > > CC arch/arm/mach-omap2/board-zoom-peripherals.o
> > > > > arch/arm/mach-omap2/board-zoom-peripherals.c:217: error: unknown field 'wires' specified in initializer
> > > > > make[1]: *** [arch/arm/mach-omap2/board-zoom-peripherals.o] Error 1
> > > > > make: *** [arch/arm/mach-omap2] Error 2
> > > >
> > > > Can you guys please queue this via the wireless tree along with
> > > > the other wl1271 patches?
> > > >
> > > > Acked-by: Tony Lindgren <[email protected]>
> > >
> > > I can apply this to the wl12xx tree. I just need John's confirmation.
> > >
> > > The pull request I sent to John last week is still pending. I don't
> > > know if it is possible to substitute it for a newer one with more
> > > patches (and still try to make it to 2.6.37). What do you think, John?
> >
> > Damn, for some reason I had a bug in John's email in my contact book.
> > Now sending to the correct email address.
>
> Applied to the wl12xx tree. I'll send a new replacement pull to John
> today, including this patch. Thanks.
Hmmm... We got a problem here. This patch breaks builds when we *don't*
have "omap: mmc extended to pass host capabilities from board file". We
don't have that on wireless-next yet, so builds with zoom boards
selected are broken.
Any ideas on how to solve this dilemma? I guess the proper way to handle
this would be to make the changes proposed in this patch when merging
instead of having a normal commit for it, wouldn't it?
--
Cheers,
Luca.
On Wed, 2010-10-06 at 17:55 +0200, ext Luciano Coelho wrote:
> On Wed, 2010-10-06 at 17:30 +0200, ext John W. Linville wrote:
> > On Wed, Oct 06, 2010 at 06:27:49PM +0300, Luciano Coelho wrote:
> > > On Wed, 2010-10-06 at 16:01 +0200, ext Gadiyar, Anand wrote:
> > > > >> Hmmm... We got a problem here. This patch breaks builds when we *don't*
> > > > >> have "omap: mmc extended to pass host capabilities from board file". We
> > > > >> don't have that on wireless-next yet, so builds with zoom boards
> > > > >> selected are broken.
> > > > >>
> > > > >> Any ideas on how to solve this dilemma? I guess the proper way to handle
> > > > >> this would be to make the changes proposed in this patch when merging
> > > > >> instead of having a normal commit for it, wouldn't it?
> > > > >
> > > > > Just cherry-pick that change into the branch of your tree that I do
> > > > > _not_ pull from. I presume that it is already available in linux-next?
> > > > >
> > > >
> > > > Yup - both patches are in linux-next; that's where we noticed the build break.
> > >
> > > Ok, I hope the patch applies cleanly in our trees.
> > >
> > > John, don't you want to do the cherry-pick on your wireless-testing
> > > then? If you do it, I can "inherit" that, because I pull from it into my
> > > "testing" branch (wl12xx/master). At the moment, w-t is broken too.
> >
> > OK, that's fine -- do you have the commit ID and the tree that has it?
>
> Stephen's linux-net, commit 3a63833ec3002816a759a49ebda4e229c089114e.
>
> http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git;a=commit;h=3a63833ec3002816a759a49ebda4e229c089114e
I have cherry-picked it and merged it (there was a tiny conflict). I've
pushed it into my wl12xx/master branch (wl12xx is at
git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git).
If you want to take it from my tree (which is already merged) into
wireless-testing, the commit is
adca3773ed7ad185b1314432b6fbf92db7e11bc0.
--
Cheers,
Luca.