colibri.h: Fix building for colibri 270...

PATCH In review Jakob Viketoft 5 participants 18 messages Apr 16, 2010 – May 5, 2010

Subsystems (3)

Arm (32-bit) Arm sub-architectures PXA2xx/PXA3xx support

lore

Share & tools

lore

Jakob Viketoft

author

2010-04-16 09:58 UTC #0 lore raw

PATCH 1/1 colibri.h: Fix building for colibri 270...

The recent addition of (Colibri) PXA3xx specific declarations breaks the building of the Colibri 270 with similar features.

CC: Daniel Mack <[email protected]>
CC: Eric Miao <[email protected]>
Signed-off-by <[email protected]>

arch/arm/mach-pxa/include/mach/colibri.h +1 -0

@@ -7,6 +7,7 @@
  * common settings for all modules
  */
 
+#if defined(CONFIG_MACH_COLIBRI300) || defined(CONFIG_MACH_COLIBRI320)
 #if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE)
 extern void colibri_pxa3xx_init_mmc(mfp_cfg_t *pins, int len, int

detect_pin);
#else
@@ -28,6 +29,7 @@
#else
static inline void colibri_pxa3xx_init_nand(void) {} #endif
+#endif

/* physical memory regions */
#define COLIBRI_SDRAM_BASE 0xa0000000 /* SDRAM region */

Daniel Mack

2010-04-16 10:01 UTC #1 lore raw

Quoted 2 lines · Jakob Viketoft

The recent addition of (Colibri) PXA3xx specific declarations breaks the building of the Colibri 270 with similar features.

Hmm, I can't see any problem here. Which error did you get? Which boards did you select in your config?

Daniel

Quoted 27 lines

CC: Daniel Mack <[email protected]>
CC: Eric Miao <[email protected]>
Signed-off-by <[email protected]>
--- a/arch/arm/mach-pxa/include/mach/colibri.h 2010-03-15
17:09:39.000000000 +0100
+++ b/arch/arm/mach-pxa/include/mach/colibri.h 2010-04-16
11:06:15.000000000 +0200
arch/arm/mach-pxa/include/mach/colibri.h +1 -0
@@ -7,6 +7,7 @@
  * common settings for all modules
  */
 
+#if defined(CONFIG_MACH_COLIBRI300) || defined(CONFIG_MACH_COLIBRI320)
 #if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE)
 extern void colibri_pxa3xx_init_mmc(mfp_cfg_t *pins, int len, int
 detect_pin);
#else
(quoted diff) +1 -0
@@ -28,6 +29,7 @@
 #else
 static inline void colibri_pxa3xx_init_nand(void) {}
 #endif
+#endif
 
 /* physical memory regions */
 #define COLIBRI_SDRAM_BASE	0xa0000000      /* SDRAM region */

Jakob Viketoft

author

2010-04-16 11:18 UTC #2 lore raw

Quoted 6 lines · Daniel Mack

Quoted 2 lines · Jakob Viketoft
The recent addition of (Colibri) PXA3xx specific declarations breaks the building of the Colibri 270 with similar features.
Hmm, I can't see any problem here. Which error did you get? Which boards did you select in your config?

Hmmm, it appears I was slightly too fast on the trigger there. I encountered the problem some time ago when migrating fron 2.6.29 to 2.6.33.1 and a quick look made me think there was a linking problem. I'm finishing up this project now and wanted to push any relevant fixes upstream. However, the problem I seem to be getting is something different though:

CC drivers/pcmcia/pxa2xx_colibri.o
In file included from drivers/pcmcia/pxa2xx_colibri.c:25:
arch/arm/mach-pxa/include/mach/colibri.h:13: error: expected ')' before '*' token make[2]: *** [drivers/pcmcia/pxa2xx_colibri.o] Error 1
make[1]: *** [drivers/pcmcia] Error 2
make: *** [drivers] Error 2

Is this an error on my part somehow?

/Jakob

Jakob Viketoft

author

2010-04-16 11:25 UTC #3 lore raw

Quoted 1 line · Jakob Viketoft

Daniel Mack wrote:

<...>

Quoted 6 lines

CC drivers/pcmcia/pxa2xx_colibri.o
In file included from drivers/pcmcia/pxa2xx_colibri.c:25:
arch/arm/mach-pxa/include/mach/colibri.h:13: error: expected ')' before '*' token make[2]: *** [drivers/pcmcia/pxa2xx_colibri.o] Error 1
make[1]: *** [drivers/pcmcia] Error 2
make: *** [drivers] Error 2

Adding a "#include <mach/mfp.h>" seem to cure this problem. If you agree I can supply a new patch with the correct solution this time.

/Jakob

Daniel Mack

2010-04-16 11:26 UTC #17 lore raw

In reply to Jakob Viketoft

Quoted 15 lines · Jakob Viketoft

Quoted 6 lines · Daniel Mack
Quoted 2 lines · Jakob Viketoft
The recent addition of (Colibri) PXA3xx specific declarations breaks the building of the Colibri 270 with similar features.
Hmm, I can't see any problem here. Which error did you get? Which boards did you select in your config?
Hmmm, it appears I was slightly too fast on the trigger there. I encountered the problem some time ago when migrating fron 2.6.29 to 2.6.33.1 and a quick look made me think there was a linking problem. I'm finishing up this project now and wanted to push any relevant fixes upstream. However, the problem I seem to be getting is something different though:

Quoted 7 lines

CC drivers/pcmcia/pxa2xx_colibri.o
In file included from drivers/pcmcia/pxa2xx_colibri.c:25:
arch/arm/mach-pxa/include/mach/colibri.h:13: error: expected ')' before '*' token
make[2]: *** [drivers/pcmcia/pxa2xx_colibri.o] Error 1 make[1]: *** [drivers/pcmcia] Error 2
make: *** [drivers] Error 2

It seems that mfp_cfg_t is unknown. Does including <mach/mfp.h> from pxa2xx_colibri.c help? However, I can't see any problem on 2.6.34-rc4, with or without CONFIG_MMC set, so that might only be related to 2.6.33. Any change of trying this on a cutting edge tree, just to make sure?

Daniel

Daniel Mack

2010-04-16 11:28 UTC #4 lore raw

In reply to Jakob Viketoft

Quoted 11 lines · Jakob Viketoft

Quoted 1 line · Jakob Viketoft
Daniel Mack wrote:
<...>
Quoted 7 lines
CC drivers/pcmcia/pxa2xx_colibri.o
In file included from drivers/pcmcia/pxa2xx_colibri.c:25:
arch/arm/mach-pxa/include/mach/colibri.h:13: error: expected ')' before '*' token
make[2]: *** [drivers/pcmcia/pxa2xx_colibri.o] Error 1 make[1]: *** [drivers/pcmcia] Error 2
make: *** [drivers] Error 2

Quoted 2 lines

Adding a "#include <mach/mfp.h>" seem to cure this problem. If you agree I can supply a new patch with the correct solution this time.

Ok. Add it to colibri.h, and while at it, you can kick the ax88796.h inclusion. That's a leftover and isn't needed.

Thanks,
Daniel

Daniel Mack

2010-04-16 11:29 UTC #5 lore raw

Quoted 6 lines · Daniel Mack

Quoted 2 lines · Jakob Viketoft
Adding a "#include <mach/mfp.h>" seem to cure this problem. If you agree I can supply a new patch with the correct solution this time.
Ok. Add it to colibri.h, and while at it, you can kick the ax88796.h inclusion. That's a leftover and isn't needed.

And Cc: [email protected] for the backmerge to 2.6.33.

Thanks,
Daniel

Eric Miao

2010-05-05 07:46 UTC #6 lore raw

Quoted 10 lines · Daniel Mack

Quoted 6 lines · Daniel Mack
Quoted 2 lines · Jakob Viketoft
Adding a "#include <mach/mfp.h>" seem to cure this problem. If you agree I can supply a new patch with the correct solution this time.
Ok. Add it to colibri.h, and while at it, you can kick the ax88796.h inclusion. That's a leftover and isn't needed.
And Cc: [email protected] for the backmerge to 2.6.33.

Jakob, any update on this?

Daniel Mack

2010-05-05 08:00 UTC #7 lore raw

Quoted 6 lines · Eric Miao

Quoted 5 lines · Daniel Mack
Quoted 4 lines · Daniel Mack
Quoted 2 lines · Jakob Viketoft
Adding a "#include <mach/mfp.h>" seem to cure this problem. If you agree I can supply a new patch with the correct solution this time.

Quoted 7 lines

Quoted 5 lines
Quoted 2 lines
Ok. Add it to colibri.h, and while at it, you can kick the ax88796.h inclusion. That's a leftover and isn't needed.
And Cc: [email protected] for the backmerge to 2.6.33.
Jakob, any update on this?

Jakob provided an updated patch for this:

http://lkml.org/lkml/2010/4/16/100

Eric Miao

2010-05-05 09:34 UTC #8 lore raw

Quoted 10 lines · Daniel Mack

Quoted 9 lines · Eric Miao
Quoted 8 lines · Daniel Mack
Quoted 6 lines · Daniel Mack
Quoted 2 lines · Jakob Viketoft
Adding a "#include <mach/mfp.h>" seem to cure this problem. If you agree I can supply a new patch with the correct solution this time.
Ok. Add it to colibri.h, and while at it, you can kick the ax88796.h inclusion. That's a leftover and isn't needed.

Quoted 9 lines

Quoted 4 lines
Quoted 2 lines
And Cc: [email protected] for the backmerge to 2.6.33.
Jakob, any update on this?
Jakob provided an updated patch for this:
http://lkml.org/lkml/2010/4/16/100

Looks it didn't make into -stable. And I'm not able to find drivers/pcmcia/pxa2xx_colibri.c as well.

Daniel, any idea?

Daniel Mack

2010-05-05 09:44 UTC #9 lore raw

Quoted 14 lines · Eric Miao

Quoted 13 lines · Daniel Mack
Quoted 12 lines · Eric Miao
Quoted 10 lines · Daniel Mack
Quoted 6 lines · Daniel Mack
Quoted 2 lines · Jakob Viketoft
Adding a "#include <mach/mfp.h>" seem to cure this problem. If you agree I can supply a new patch with the correct solution this time.
Ok. Add it to colibri.h, and while at it, you can kick the ax88796.h inclusion. That's a leftover and isn't needed.
And Cc: [email protected] for the backmerge to 2.6.33.

Quoted 8 lines

Quoted 6 lines
Quoted 1 line
Jakob, any update on this?
Jakob provided an updated patch for this:
http://lkml.org/lkml/2010/4/16/100
Looks it didn't make into -stable.

Greg, [email protected] was in Cc: for the patch in the URL above. Any chance to get this in?

Quoted 2 lines

And I'm not able to find
drivers/pcmcia/pxa2xx_colibri.c as well.

Erm - how is that related to the patch in question?

Daniel

Eric Miao

2010-05-05 09:47 UTC #10 lore raw

Quoted 24 lines · Daniel Mack

Quoted 14 lines · Eric Miao
Quoted 13 lines · Daniel Mack
Quoted 12 lines · Eric Miao
Quoted 10 lines · Daniel Mack
Quoted 6 lines · Daniel Mack
Quoted 2 lines · Jakob Viketoft
Adding a "#include <mach/mfp.h>" seem to cure this problem. If you agree I can supply a new patch with the correct solution this time.
Ok. Add it to colibri.h, and while at it, you can kick the ax88796.h inclusion. That's a leftover and isn't needed.
And Cc: [email protected] for the backmerge to 2.6.33.
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
Jakob, any update on this?
Jakob provided an updated patch for this:
http://lkml.org/lkml/2010/4/16/100
Looks it didn't make into -stable.

Quoted 8 lines

Greg, [email protected] was in Cc: for the patch in the URL above. Any chance to get this in?
Quoted 2 lines
And I'm not able to find
drivers/pcmcia/pxa2xx_colibri.c as well.
Erm - how is that related to the patch in question?

The error seems to be (as in previous mail):

CC drivers/pcmcia/pxa2xx_colibri.o
In file included from drivers/pcmcia/pxa2xx_colibri.c:25:
arch/arm/mach-pxa/include/mach/colibri.h:13: error: expected ')' before '*' token
make[2]: *** [drivers/pcmcia/pxa2xx_colibri.o] Error 1 make[1]: *** [drivers/pcmcia] Error 2
make: *** [drivers] Error 2

And actually, inclusion of <mach/mfp.h> is better to be placed where it's used, i.e. drivers/pcmcia/pxa2xx_colibri.c.

Quoted 2 lines

Daniel

Daniel Mack

2010-05-05 09:53 UTC #11 lore raw

Quoted 10 lines · Eric Miao

Quoted 5 lines · Daniel Mack
Quoted 2 lines
And I'm not able to find
drivers/pcmcia/pxa2xx_colibri.c as well.
Erm - how is that related to the patch in question?
The error seems to be (as in previous mail):

Quoted 7 lines

CC drivers/pcmcia/pxa2xx_colibri.o
In file included from drivers/pcmcia/pxa2xx_colibri.c:25:
arch/arm/mach-pxa/include/mach/colibri.h:13: error: expected ')' before '*' token
make[2]: *** [drivers/pcmcia/pxa2xx_colibri.o] Error 1 make[1]: *** [drivers/pcmcia] Error 2
make: *** [drivers] Error 2

Ah, sorry.

Quoted 2 lines

And actually, inclusion of <mach/mfp.h> is better to be placed where it's used, i.e. drivers/pcmcia/pxa2xx_colibri.c.

In general I agree, but in this case, mfp_t is used in this header file, so every piece of code which includes colibri.h will need both <mach/mfp.h> and <net/ax88796.h>. And as this is a rule for all users, I think the right place for the inclusion is the header file?

Apart from that, this fix will work for both mainline and -stable, which makes things easier :)

Daniel

Eric Miao

Acked-by

2010-05-05 10:22 UTC #12 lore raw

Quoted 21 lines · Daniel Mack

Quoted 10 lines · Eric Miao
Quoted 5 lines · Daniel Mack
Quoted 2 lines
And I'm not able to find
drivers/pcmcia/pxa2xx_colibri.c as well.
Erm - how is that related to the patch in question?
The error seems to be (as in previous mail):
Quoted 7 lines
CC drivers/pcmcia/pxa2xx_colibri.o
In file included from drivers/pcmcia/pxa2xx_colibri.c:25:
arch/arm/mach-pxa/include/mach/colibri.h:13: error: expected ')' before '*' token
make[2]: *** [drivers/pcmcia/pxa2xx_colibri.o] Error 1 make[1]: *** [drivers/pcmcia] Error 2
make: *** [drivers] Error 2
Ah, sorry.

Quoted 8 lines

Quoted 2 lines
And actually, inclusion of <mach/mfp.h> is better to be placed where it's used, i.e. drivers/pcmcia/pxa2xx_colibri.c.
In general I agree, but in this case, mfp_t is used in this header file, so every piece of code which includes colibri.h will need both <mach/mfp.h> and <net/ax88796.h>. And as this is a rule for all users, I think the right place for the inclusion is the header file?

I see.

Acked-by Eric Miao <[email protected]>

Quoted 3 lines

Apart from that, this fix will work for both mainline and -stable, which makes things easier :)

I'll take it to -pxa then.

Quoted 3 lines

Daniel

Jakob Viketoft

2010-05-05 11:28 UTC #13 lore raw

Hello!

I didn't see this first as the e-mail address [email protected] is being shut down (changing jobs).

Quoted 9 lines · Eric Miao

Quoted 8 lines · Daniel Mack
Quoted 7 lines · Eric Miao
Quoted 4 lines · Daniel Mack
Quoted 2 lines
And I'm not able to find
drivers/pcmcia/pxa2xx_colibri.c as well.
Erm - how is that related to the patch in question?
The error seems to be (as in previous mail):

Quoted 8 lines

Quoted 8 lines
Quoted 7 lines
CC drivers/pcmcia/pxa2xx_colibri.o
In file included from drivers/pcmcia/pxa2xx_colibri.c:25:
arch/arm/mach-pxa/include/mach/colibri.h:13: error: expected ')' before '*' token
make[2]: *** [drivers/pcmcia/pxa2xx_colibri.o] Error 1 make[1]: *** [drivers/pcmcia] Error 2
make: *** [drivers] Error 2
Ah, sorry.

The pcmcia-patch isn't my work, but that of Alex A. Mihaylov ([email protected]). I was hoping that he would be pushing those bits upstream separately, but I think some things needs to me shifted around a bit to be accepted.

Quoted 9 lines

Quoted 8 lines
Quoted 3 lines
And actually, inclusion of <mach/mfp.h> is better to be placed where it's used, i.e. drivers/pcmcia/pxa2xx_colibri.c.
In general I agree, but in this case, mfp_t is used in this header file, so every piece of code which includes colibri.h will need both <mach/mfp.h> and <net/ax88796.h>. And as this is a rule for all users, I think the right place for the inclusion is the header file?

Quoted 3 lines

I see.
Acked-by Eric Miao <[email protected]>

Thanks.

Quoted 7 lines

Quoted 5 lines
Apart from that, this fix will work for both mainline and -stable, which makes things easier :)
I'll take it to -pxa then.

Sounds good!

/Jakob

Greg KH

2010-05-05 15:20 UTC #14 lore raw

In reply to Daniel Mack

Quoted 19 lines · Daniel Mack

Quoted 18 lines · Eric Miao
Quoted 17 lines · Daniel Mack
Quoted 6 lines · Eric Miao
Quoted 5 lines · Daniel Mack
Quoted 4 lines · Daniel Mack
Quoted 2 lines · Jakob Viketoft
Adding a "#include <mach/mfp.h>" seem to cure this problem. If you agree I can supply a new patch with the correct solution this time.
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
Ok. Add it to colibri.h, and while at it, you can kick the ax88796.h inclusion. That's a leftover and isn't needed.
And Cc: [email protected] for the backmerge to 2.6.33.
Jakob, any update on this?
Jakob provided an updated patch for this:

Quoted 7 lines

Quoted 4 lines
Quoted 2 lines
http://lkml.org/lkml/2010/4/16/100
Looks it didn't make into -stable.
Greg, [email protected] was in Cc: for the patch in the URL above. Any chance to get this in?

Is it in Linus's tree? If so, what is the git commit id of it? If you properly tag the patch with "cc: stable <[email protected]>" like you did in the patch, then it will be automatically sent to me when it hits Linus's tree.

I don't see this one in my queue at the moment.

thanks,

greg k-h

Daniel Mack

2010-05-05 15:54 UTC #15 lore raw

Quoted 25 lines · Greg KH

Quoted 24 lines · Daniel Mack
Quoted 22 lines · Eric Miao
Quoted 10 lines · Daniel Mack
Quoted 9 lines · Eric Miao
Quoted 8 lines · Daniel Mack
Quoted 6 lines · Daniel Mack
Quoted 2 lines · Jakob Viketoft
Adding a "#include <mach/mfp.h>" seem to cure this problem. If you agree I can supply a new patch with the correct solution this time.
Ok. Add it to colibri.h, and while at it, you can kick the ax88796.h inclusion. That's a leftover and isn't needed.
Quoted 9 lines
Quoted 4 lines
Quoted 2 lines
And Cc: [email protected] for the backmerge to 2.6.33.
Jakob, any update on this?
Jakob provided an updated patch for this:
http://lkml.org/lkml/2010/4/16/100
Looks it didn't make into -stable.

Quoted 7 lines

Quoted 2 lines
Greg, [email protected] was in Cc: for the patch in the URL above. Any chance to get this in?
Is it in Linus's tree? If so, what is the git commit id of it? If you properly tag the patch with "cc: stable <[email protected]>" like you did in the patch, then it will be automatically sent to me when it hits Linus's tree.

I see - thought you were picking them up from the mails. Thanks for explaining :)

Quoted 1 line

I don't see this one in my queue at the moment.

It's not there yet. Eric picked it, but I'm not sure whether it will still make it to .34. But ok, let's just wait then.

Thanks,
Daniel

Greg KH

2010-05-05 16:17 UTC #16 lore raw

Quoted 34 lines · Daniel Mack

Quoted 25 lines · Greg KH
Quoted 24 lines · Daniel Mack
Quoted 22 lines · Eric Miao
Quoted 10 lines · Daniel Mack
Quoted 9 lines · Eric Miao
Quoted 8 lines · Daniel Mack
Quoted 6 lines · Daniel Mack
Quoted 2 lines · Jakob Viketoft
Adding a "#include <mach/mfp.h>" seem to cure this problem. If you agree I can supply a new patch with the correct solution this time.
Ok. Add it to colibri.h, and while at it, you can kick the ax88796.h inclusion. That's a leftover and isn't needed.
Quoted 9 lines
Quoted 4 lines
Quoted 2 lines
And Cc: [email protected] for the backmerge to 2.6.33.
Jakob, any update on this?
Jakob provided an updated patch for this:
http://lkml.org/lkml/2010/4/16/100
Looks it didn't make into -stable.
Quoted 7 lines
Quoted 2 lines
Greg, [email protected] was in Cc: for the patch in the URL above. Any chance to get this in?
Is it in Linus's tree? If so, what is the git commit id of it? If you properly tag the patch with "cc: stable <[email protected]>" like you did in the patch, then it will be automatically sent to me when it hits Linus's tree.

Quoted 7 lines

I see - thought you were picking them up from the mails. Thanks for explaining :)
Quoted 1 line
I don't see this one in my queue at the moment.
It's not there yet. Eric picked it, but I'm not sure whether it will still make it to .34. But ok, let's just wait then.

I _CAN_NOT_ take patches into the stable tree before they go into Linus's tree, so even if I was picking them up from emails, this could not be accepted.

Please read the file, Documentation/stable_kernel_rules.txt for how the process works.

thanks,

greg k-h