* [PATCH 1/2] ARM: pxa: fix building error by palm27x_lcd_init() when FB_PXA not defined
@ 2011-09-26 3:53 Eric Miao
2011-09-26 3:53 ` [PATCH 2/2] ARM: pxa/z2: fix building error of pxa27x_cpu_suspend() no longer available Eric Miao
2011-09-26 9:00 ` [PATCH 1/2] ARM: pxa: fix building error by palm27x_lcd_init() when FB_PXA not defined Marek Vasut
0 siblings, 2 replies; 6+ messages in thread
From: Eric Miao @ 2011-09-26 3:53 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
---
arch/arm/mach-pxa/include/mach/palm27x.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-pxa/include/mach/palm27x.h b/arch/arm/mach-pxa/include/mach/palm27x.h
index 0a5e5ea..f80bbe2 100644
--- a/arch/arm/mach-pxa/include/mach/palm27x.h
+++ b/arch/arm/mach-pxa/include/mach/palm27x.h
@@ -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.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] ARM: pxa/z2: fix building error of pxa27x_cpu_suspend() no longer available
2011-09-26 3:53 [PATCH 1/2] ARM: pxa: fix building error by palm27x_lcd_init() when FB_PXA not defined Eric Miao
@ 2011-09-26 3:53 ` Eric Miao
2011-09-26 9:00 ` [PATCH 1/2] ARM: pxa: fix building error by palm27x_lcd_init() when FB_PXA not defined Marek Vasut
1 sibling, 0 replies; 6+ messages in thread
From: Eric Miao @ 2011-09-26 3:53 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
---
arch/arm/mach-pxa/z2.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-pxa/z2.c b/arch/arm/mach-pxa/z2.c
index 6c9275a..6fa4e74 100644
--- a/arch/arm/mach-pxa/z2.c
+++ b/arch/arm/mach-pxa/z2.c
@@ -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
--
1.7.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 1/2] ARM: pxa: fix building error by palm27x_lcd_init() when FB_PXA not defined
2011-09-26 3:53 [PATCH 1/2] ARM: pxa: fix building error by palm27x_lcd_init() when FB_PXA not defined Eric Miao
2011-09-26 3:53 ` [PATCH 2/2] ARM: pxa/z2: fix building error of pxa27x_cpu_suspend() no longer available Eric Miao
@ 2011-09-26 9:00 ` Marek Vasut
2011-09-26 9:02 ` Eric Miao
1 sibling, 1 reply; 6+ messages in thread
From: Marek Vasut @ 2011-09-26 9:00 UTC (permalink / raw)
To: linux-arm-kernel
On Monday, September 26, 2011 05:53:16 AM Eric Miao wrote:
> Cc: Marek Vasut <marek.vasut@gmail.com>
> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
> ---
> arch/arm/mach-pxa/include/mach/palm27x.h | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/include/mach/palm27x.h
> b/arch/arm/mach-pxa/include/mach/palm27x.h index 0a5e5ea..f80bbe2 100644
> --- a/arch/arm/mach-pxa/include/mach/palm27x.h
> +++ b/arch/arm/mach-pxa/include/mach/palm27x.h
> @@ -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
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/2] ARM: pxa: fix building error by palm27x_lcd_init() when FB_PXA not defined
2011-09-26 9:00 ` [PATCH 1/2] ARM: pxa: fix building error by palm27x_lcd_init() when FB_PXA not defined Marek Vasut
@ 2011-09-26 9:02 ` Eric Miao
2011-09-26 9:06 ` Marek Vasut
2011-09-26 9:46 ` Marek Vasut
0 siblings, 2 replies; 6+ messages in thread
From: Eric Miao @ 2011-09-26 9:02 UTC (permalink / raw)
To: linux-arm-kernel
2011/9/26 Marek Vasut <marek.vasut@gmail.com>:
> On Monday, September 26, 2011 05:53:16 AM Eric Miao wrote:
>> Cc: Marek Vasut <marek.vasut@gmail.com>
>> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
>> ---
>> ?arch/arm/mach-pxa/include/mach/palm27x.h | ? ?2 +-
>> ?1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/arch/arm/mach-pxa/include/mach/palm27x.h
>> b/arch/arm/mach-pxa/include/mach/palm27x.h index 0a5e5ea..f80bbe2 100644
>> --- a/arch/arm/mach-pxa/include/mach/palm27x.h
>> +++ b/arch/arm/mach-pxa/include/mach/palm27x.h
>> @@ -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.
OK, I'll hold this one. Feel free to give me a solution.
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/2] ARM: pxa: fix building error by palm27x_lcd_init() when FB_PXA not defined
2011-09-26 9:02 ` Eric Miao
@ 2011-09-26 9:06 ` Marek Vasut
2011-09-26 9:46 ` Marek Vasut
1 sibling, 0 replies; 6+ messages in thread
From: Marek Vasut @ 2011-09-26 9:06 UTC (permalink / raw)
To: linux-arm-kernel
On Monday, September 26, 2011 11:02:03 AM Eric Miao wrote:
> 2011/9/26 Marek Vasut <marek.vasut@gmail.com>:
> > On Monday, September 26, 2011 05:53:16 AM Eric Miao wrote:
> >> Cc: Marek Vasut <marek.vasut@gmail.com>
> >> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
> >> ---
> >> arch/arm/mach-pxa/include/mach/palm27x.h | 2 +-
> >> 1 files changed, 1 insertions(+), 1 deletions(-)
> >>
> >> diff --git a/arch/arm/mach-pxa/include/mach/palm27x.h
> >> b/arch/arm/mach-pxa/include/mach/palm27x.h index 0a5e5ea..f80bbe2 100644
> >> --- a/arch/arm/mach-pxa/include/mach/palm27x.h
> >> +++ b/arch/arm/mach-pxa/include/mach/palm27x.h
> >> @@ -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.
>
> OK, I'll hold this one. Feel free to give me a solution.
Hang on, I'll run it through the cogs.
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/2] ARM: pxa: fix building error by palm27x_lcd_init() when FB_PXA not defined
2011-09-26 9:02 ` Eric Miao
2011-09-26 9:06 ` Marek Vasut
@ 2011-09-26 9:46 ` Marek Vasut
1 sibling, 0 replies; 6+ messages in thread
From: Marek Vasut @ 2011-09-26 9:46 UTC (permalink / raw)
To: linux-arm-kernel
On Monday, September 26, 2011 11:02:03 AM Eric Miao wrote:
> 2011/9/26 Marek Vasut <marek.vasut@gmail.com>:
> > On Monday, September 26, 2011 05:53:16 AM Eric Miao wrote:
> >> Cc: Marek Vasut <marek.vasut@gmail.com>
> >> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
> >> ---
> >> arch/arm/mach-pxa/include/mach/palm27x.h | 2 +-
> >> 1 files changed, 1 insertions(+), 1 deletions(-)
> >>
> >> diff --git a/arch/arm/mach-pxa/include/mach/palm27x.h
> >> b/arch/arm/mach-pxa/include/mach/palm27x.h index 0a5e5ea..f80bbe2 100644
> >> --- a/arch/arm/mach-pxa/include/mach/palm27x.h
> >> +++ b/arch/arm/mach-pxa/include/mach/palm27x.h
> >> @@ -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.
>
> 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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-09-26 9:46 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-26 3:53 [PATCH 1/2] ARM: pxa: fix building error by palm27x_lcd_init() when FB_PXA not defined Eric Miao
2011-09-26 3:53 ` [PATCH 2/2] ARM: pxa/z2: fix building error of pxa27x_cpu_suspend() no longer available Eric Miao
2011-09-26 9:00 ` [PATCH 1/2] ARM: pxa: fix building error by palm27x_lcd_init() when FB_PXA not defined Marek Vasut
2011-09-26 9:02 ` Eric Miao
2011-09-26 9:06 ` Marek Vasut
2011-09-26 9:46 ` Marek Vasut
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).