Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 308436
b: refs/heads/master
c: a4b4674
h: refs/heads/master
v: v3
  • Loading branch information
Shawn Guo committed May 8, 2012
1 parent 2c19cf7 commit f822a1b
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cafa61907cb0aabbedf3c248f197130dc5332147
refs/heads/master: a4b4674e26da6b2c40f5b6485e165beb8f68d335
6 changes: 6 additions & 0 deletions trunk/arch/arm/mach-prima2/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,10 @@ static inline void sirfsoc_map_lluart(void) {}
extern void __init sirfsoc_map_lluart(void);
#endif

#ifdef CONFIG_SUSPEND
extern int sirfsoc_pm_init(void);
#else
static inline int sirfsoc_pm_init(void) { return 0; }
#endif

#endif
3 changes: 1 addition & 2 deletions trunk/arch/arm/mach-prima2/pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,11 @@ static const struct platform_suspend_ops sirfsoc_pm_ops = {
.valid = suspend_valid_only_mem,
};

static int __init sirfsoc_pm_init(void)
int __init sirfsoc_pm_init(void)
{
suspend_set_ops(&sirfsoc_pm_ops);
return 0;
}
late_initcall(sirfsoc_pm_init);

static const struct of_device_id pwrc_ids[] = {
{ .compatible = "sirf,prima2-pwrc" },
Expand Down
6 changes: 6 additions & 0 deletions trunk/arch/arm/mach-prima2/prima2.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ void __init sirfsoc_mach_init(void)
of_platform_bus_probe(NULL, sirfsoc_of_bus_ids, NULL);
}

void __init sirfsoc_init_late(void)
{
sirfsoc_pm_init();
}

static const char *prima2cb_dt_match[] __initdata = {
"sirf,prima2-cb",
NULL
Expand All @@ -39,6 +44,7 @@ MACHINE_START(PRIMA2_EVB, "prima2cb")
.timer = &sirfsoc_timer,
.dma_zone_size = SZ_256M,
.init_machine = sirfsoc_mach_init,
.init_late = sirfsoc_init_late,
.dt_compat = prima2cb_dt_match,
.restart = sirfsoc_restart,
MACHINE_END

0 comments on commit f822a1b

Please sign in to comment.