Skip to contentSkip to conversation

arm/pxa: fix build of it8152

PATCH New Sebastian Andrzej Siewior 4 participants 6 messages Dec 29, 2010 – Jan 4, 2011

Subsystems (3)
Arm (32-bit) Arm sub-architectures PXA2xx/PXA3xx support
lore
Share & tools
lore

Sebastian Andrzej Siewior

author
#0 lore raw

PATCH 1/2 arm/pxa: fix build of it8152

Probably since 6ac6b817 aka ("ARM: pxa: encode IRQ number into .nr_irqs") the build fails with:

|   CC      arch/arm/common/it8152.o
| arch/arm/common/it8152.c: In function ?it8152_init_irq?:
| arch/arm/common/it8152.c:86: error: ?IT8152_LAST_IRQ? undeclared (first use in this function)
| arch/arm/common/it8152.c:86: error: (Each undeclared identifier is reported only once
| arch/arm/common/it8152.c:86: error: for each function it appears in.)

Before that commit IT8152_LAST_IRQ was (IRQ_BOARD_END + 40) with the first IRQ beeing IRQ_BOARD_START. This change als adds +40 so I hope this works (I have no HW to verify).

Signed-off-by Sebastian Andrzej Siewior <[email protected]>
---
 arch/arm/include/asm/hardware/it8152.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
arch/arm/include/asm/hardware/it8152.h +2 -0
index 21fa272..e3931a9 100644
@@ -81,6 +81,8 @@ extern unsigned long it8152_base_address;
 #define IT8152_LD_IRQ_COUNT     9
 #define IT8152_LP_IRQ_COUNT     16
 #define IT8152_PD_IRQ_COUNT     15
+#define IT8152_LAST_IRQ		(IT8152_IRQ(0) + IT8152_LD_IRQ_COUNT + \
+				IT8152_LP_IRQ_COUNT + IT8152_PD_IRQ_COUNT)
 
 /* Priorities: */
 #define IT8152_PD_IRQ(i)        IT8152_IRQ(i)
Signature · 1 line
1.7.3.2
author
#1 lore raw

PATCH 2/2 arm/pxa: buildfix for pam27x without fb

|arch/arm/mach-pxa/palmld.c: In function ?palmld_init?:
|arch/arm/mach-pxa/palmld.c:330: error: ?palm_320x480_lcd_mode? undeclared (first use in this function)
|arch/arm/mach-pxa/palmld.c:330: error: (Each undeclared identifier is reported only once
|arch/arm/mach-pxa/palmld.c:330: error: for each function it appears in.)
Signed-off-by Sebastian Andrzej Siewior <[email protected]>
---
 arch/arm/mach-pxa/include/mach/palm27x.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-pxa/include/mach/palm27x.h +1 -1
index 0a5e5ea..7b7927c 100644
@@ -34,7 +34,7 @@ extern struct pxafb_mode_info palm_320x320_new_lcd_mode;
 extern void __init palm27x_lcd_init(int power,
 					struct pxafb_mode_info *mode);
 #else
-static inline void palm27x_lcd_init(int power, struct pxafb_mode_info *mode) {}
+#define palm27x_lcd_init(power, mode)	do { } while (0)
 #endif
 
 #if	defined(CONFIG_USB_GADGET_PXA27X) || \
Signature · 1 line
1.7.3.2
#2 lore raw

PATCH 2/2 arm/pxa: buildfix for pam27x without fb

Quoted 6 lines · Sebastian Andrzej Siewior
|arch/arm/mach-pxa/palmld.c: In function ?palmld_init?:
|arch/arm/mach-pxa/palmld.c:330: error: ?palm_320x480_lcd_mode? undeclared (first use in this function)
|arch/arm/mach-pxa/palmld.c:330: error: (Each undeclared identifier is reported only once
|arch/arm/mach-pxa/palmld.c:330: error: for each function it appears in.)
Signed-off-by Sebastian Andrzej Siewior <[email protected]>

Marek,

I need your ack please.

Quoted 21 lines

---
?arch/arm/mach-pxa/include/mach/palm27x.h | ? ?2 +- ?1 files changed, 1 insertions(+), 1 deletions(-)

arch/arm/mach-pxa/include/mach/palm27x.h +0 -0
index 0a5e5ea..7b7927c 100644
@@ -34,7 +34,7 @@ extern struct pxafb_mode_info palm_320x320_new_lcd_mode;
 ?extern void __init palm27x_lcd_init(int power,
 ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?struct pxafb_mode_info *mode);

?#else

arch/arm/mach-pxa/include/mach/palm27x.h +1 -1
-static inline void palm27x_lcd_init(int power, struct pxafb_mode_info *mode) {}
+#define palm27x_lcd_init(power, mode) ?do { } while (0)

?#endif

?#if ? ?defined(CONFIG_USB_GADGET_PXA27X) || \
--
1.7.3.2

#3 lore raw

PATCH 2/2 arm/pxa: buildfix for pam27x without fb

Quoted 10 lines · On Monday 03 January 2011 16:57:27 Eric Miao wrote:

On Thu, Dec 30, 2010 at 4:33 AM, Sebastian Andrzej Siewior

Quoted 7 lines · <[email protected]> wrote:
|arch/arm/mach-pxa/palmld.c: In function ?palmld_init?:
|arch/arm/mach-pxa/palmld.c:330: error: ?palm_320x480_lcd_mode?
|undeclared (first use in this function) arch/arm/mach-pxa/palmld.c:330:
|error: (Each undeclared identifier is reported only once
|arch/arm/mach-pxa/palmld.c:330: error: for each function it appears
|in.)
Quoted 5 lines
Quoted 1 line
Signed-off-by Sebastian Andrzej Siewior <[email protected]>

Marek,

I need your ack please.

I don't like it being done with preprocessor macro. Maybe we should rather pull palm_320x320_new_lcd_mode and others outside the #if defined() ?

Quoted 21 lines
Quoted 21 lines
---
 arch/arm/mach-pxa/include/mach/palm27x.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
(quoted diff) +0 -0

b/arch/arm/mach-pxa/include/mach/palm27x.h index 0a5e5ea..7b7927c 100644

arch/arm/mach-pxa/include/mach/palm27x.h +0 -0
@@ -34,7 +34,7 @@ extern struct pxafb_mode_info

palm_320x320_new_lcd_mode; extern void __init palm27x_lcd_init(int power,

                                       struct pxafb_mode_info *mode);

#else
-static inline void palm27x_lcd_init(int power, struct pxafb_mode_info *mode) {} +#define palm27x_lcd_init(power, mode) do { } while (0)
#endif

#if defined(CONFIG_USB_GADGET_PXA27X) || \
--
1.7.3.2

#4 lore raw

PATCH 2/2 arm/pxa: buildfix for pam27x without fb

Quoted 11 lines · Marek Vasut
Quoted 10 lines · On Monday 03 January 2011 16:57:27 Eric Miao wrote:

On Thu, Dec 30, 2010 at 4:33 AM, Sebastian Andrzej Siewior

Quoted 7 lines · <[email protected]> wrote:
|arch/arm/mach-pxa/palmld.c: In function ?palmld_init?:
|arch/arm/mach-pxa/palmld.c:330: error: ?palm_320x480_lcd_mode?
|undeclared (first use in this function) arch/arm/mach-pxa/palmld.c:330:
|error: (Each undeclared identifier is reported only once
|arch/arm/mach-pxa/palmld.c:330: error: for each function it appears
|in.)
Quoted 9 lines
Quoted 5 lines
Quoted 1 line
Signed-off-by Sebastian Andrzej Siewior <[email protected]>

Marek,

I need your ack please.

I don't like it being done with preprocessor macro. Maybe we should rather pull palm_320x320_new_lcd_mode and others outside the #if defined() ?

Yeah, that will be at least a bit more consistent.

Quoted 22 lines
Quoted 21 lines
Quoted 21 lines

---
?arch/arm/mach-pxa/include/mach/palm27x.h | ? ?2 +- ?1 files changed, 1 insertions(+), 1 deletions(-)

(quoted diff) +0 -0

b/arch/arm/mach-pxa/include/mach/palm27x.h index 0a5e5ea..7b7927c 100644

arch/arm/mach-pxa/include/mach/palm27x.h +0 -0
@@ -34,7 +34,7 @@ extern struct pxafb_mode_info

palm_320x320_new_lcd_mode; extern void __init palm27x_lcd_init(int power,
? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?struct pxafb_mode_info *mode); ?#else
-static inline void palm27x_lcd_init(int power, struct pxafb_mode_info *mode) {} +#define palm27x_lcd_init(power, mode) ?do { } while (0) ?#endif

?#if ? ?defined(CONFIG_USB_GADGET_PXA27X) || \
--
1.7.3.2

#5 lore raw

PATCH 1/2 arm/pxa: fix build of it8152

In reply to Sebastian Andrzej Siewior
Quoted 8 lines · Sebastian Andrzej Siewior

Probably since 6ac6b817 aka ("ARM: pxa: encode IRQ number into .nr_irqs") the build fails with:

|   CC      arch/arm/common/it8152.o
| arch/arm/common/it8152.c: In function ?it8152_init_irq?:
| arch/arm/common/it8152.c:86: error: ?IT8152_LAST_IRQ? undeclared (first use in this function)
| arch/arm/common/it8152.c:86: error: (Each undeclared identifier is reported only once
| arch/arm/common/it8152.c:86: error: for each function it appears in.)
Quoted 5 lines

Before that commit IT8152_LAST_IRQ was (IRQ_BOARD_END + 40) with the first IRQ beeing IRQ_BOARD_START. This change als adds +40 so I hope this works (I have no HW to verify).

Signed-off-by Sebastian Andrzej Siewior <[email protected]>

I've already sent a patch for this (1), hopefully Eric or Russell will pick it up.

[1]
http://lists.infradead.org/pipermail/linux-arm-kernel/2010-December/036570.html

Quoted 17 lines
---
 arch/arm/include/asm/hardware/it8152.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
arch/arm/include/asm/hardware/it8152.h +2 -0
index 21fa272..e3931a9 100644
@@ -81,6 +81,8 @@ extern unsigned long it8152_base_address;
 #define IT8152_LD_IRQ_COUNT     9
 #define IT8152_LP_IRQ_COUNT     16
 #define IT8152_PD_IRQ_COUNT     15
+#define IT8152_LAST_IRQ		(IT8152_IRQ(0) + IT8152_LD_IRQ_COUNT + \
+				IT8152_LP_IRQ_COUNT + IT8152_PD_IRQ_COUNT)
 
 /* Priorities: */
 #define IT8152_PD_IRQ(i)        IT8152_IRQ(i)
Signature · 2 lines
Sincerely yours,
Mike.