Skip to contentSkip to conversation

ARM: pxa: fix building error by palm27x_lcd_init() when FB_PXA not defined

PATCH New Eric Miao 2 participants 6 messages Sep 26, 2011

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

Eric Miao

author
#0 lore raw

PATCH 1/2 ARM: pxa: fix building error by palm27x_lcd_init() when FB_PXA not defined

Cc Marek Vasut <[email protected]>
Signed-off-by Eric Miao <[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..f80bbe2 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.4.1
author
#1 lore raw

PATCH 2/2 ARM: pxa/z2: fix building error of pxa27x_cpu_suspend() no longer available

Cc Vasily Khoruzhick <[email protected]>
Signed-off-by Eric Miao <[email protected]>
---
 arch/arm/mach-pxa/z2.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
arch/arm/mach-pxa/z2.c +4 -1
index 6c9275a..6fa4e74 100644
@@ -679,6 +679,8 @@ static inline void z2_pmic_init(void) {}
 #endif
 
 #ifdef CONFIG_PM
+extern void pxa27x_cpu_pm_enter(suspend_state_t state);
+
 static void z2_power_off(void)
 {
 	/* We're using deep sleep as poweroff, so clear PSPR to ensure that

@@ -686,7 +688,8 @@ static void z2_power_off(void)
 	 */
 	PSPR = 0x0;
 	local_irq_disable();
-	pxa27x_cpu_suspend(PWRMODE_DEEPSLEEP, PLAT_PHYS_OFFSET - PAGE_OFFSET);
+	pxa27x_set_pwrmode(PWRMODE_DEEPSLEEP);
+	pxa27x_cpu_pm_enter(PM_SUSPEND_MEM);
 }
 #else
 #define z2_power_off   NULL
Signature · 1 line
1.7.4.1
#2 lore raw

PATCH 1/2 ARM: pxa: fix building error by palm27x_lcd_init() when FB_PXA not defined

In reply to Eric Miao
Quoted 11 lines · Eric Miao
Cc Marek Vasut <[email protected]>
Signed-off-by Eric Miao <[email protected]>
---
 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..f80bbe2 100644

arch/arm/mach-pxa/include/mach/palm27x.h extern struct pxafb_mode_info palm_320x320_new_lcd_mode; · line 40

Quoted 8 lines
arch/arm/mach-pxa/include/mach/palm27x.h +0 -1
@@ -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) || \

Hi Eric,

NAK. Why do you do such a change ? Especially as this will likely interfere with gcc4.6's unused-but-set variable checking.

Cheer

author
#3 lore raw

PATCH 1/2 ARM: pxa: fix building error by palm27x_lcd_init() when FB_PXA not defined

2011/9/26 Marek Vasut <[email protected]>:

Quoted 19 lines · Eric Miao
Quoted 18 lines
Cc Marek Vasut <[email protected]>
Signed-off-by Eric Miao <[email protected]>

---
?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..f80bbe2 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

Quoted 6 lines
Quoted 1 line

?#if ?defined(CONFIG_USB_GADGET_PXA27X) || \

Hi Eric,

NAK. Why do you do such a change ? Especially as this will likely interfere with gcc4.6's unused-but-set variable checking.

OK, I'll hold this one. Feel free to give me a solution.

#4 lore raw

PATCH 1/2 ARM: pxa: fix building error by palm27x_lcd_init() when FB_PXA not defined

Quoted 21 lines · Eric Miao

2011/9/26 Marek Vasut <[email protected]>:

Quoted 20 lines · Eric Miao
Quoted 19 lines
Cc Marek Vasut <[email protected]>
Signed-off-by Eric Miao <[email protected]>
---
 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..f80bbe2 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

Quoted 8 lines
Quoted 6 lines
Quoted 1 line

#if defined(CONFIG_USB_GADGET_PXA27X) || \

Hi Eric,

NAK. Why do you do such a change ? Especially as this will likely interfere with gcc4.6's unused-but-set variable checking.

OK, I'll hold this one. Feel free to give me a solution.

Hang on, I'll run it through the cogs.

#5 lore raw

PATCH 1/2 ARM: pxa: fix building error by palm27x_lcd_init() when FB_PXA not defined

In reply to Eric Miao
Quoted 21 lines · Eric Miao

2011/9/26 Marek Vasut <[email protected]>:

Quoted 20 lines · Eric Miao
Quoted 19 lines
Cc Marek Vasut <[email protected]>
Signed-off-by Eric Miao <[email protected]>
---
 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..f80bbe2 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

Quoted 8 lines
Quoted 6 lines
Quoted 1 line

#if defined(CONFIG_USB_GADGET_PXA27X) || \

Hi Eric,

NAK. Why do you do such a change ? Especially as this will likely interfere with gcc4.6's unused-but-set variable checking.

OK, I'll hold this one. Feel free to give me a solution.

Hi Eric,

I see your point now, I think you can drop this one in then. Sorry for the hold.

Cheers