Skip to content

Commit

Permalink
[POWERPC] pasemi: Move pasemi_idle_init() to late_initcall()
Browse files Browse the repository at this point in the history
Move pasemi_idle_init() to be a late_initcall instead of being called from
setup_arch().  This way the cpufreq driver has a chance to initialize and
save away the boot time astate before we go to idle for the first time.

Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Olof Johansson authored and Paul Mackerras committed Sep 13, 2007
1 parent cd78341 commit 3850169
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
8 changes: 7 additions & 1 deletion arch/powerpc/platforms/pasemi/idle.c
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,11 @@ static int pasemi_system_reset_exception(struct pt_regs *regs)
return 1;
}

void __init pasemi_idle_init(void)
static int __init pasemi_idle_init(void)
{
if (!machine_is(pasemi))
return -ENODEV;

#ifndef CONFIG_PPC_PASEMI_CPUFREQ
printk(KERN_WARNING "No cpufreq driver, powersavings modes disabled\n");
current_mode = 0;
Expand All @@ -82,7 +85,10 @@ void __init pasemi_idle_init(void)
ppc_md.system_reset_exception = pasemi_system_reset_exception;
ppc_md.power_save = modes[current_mode].entry;
printk(KERN_INFO "Using PA6T idle loop (%s)\n", modes[current_mode].name);

return 0;
}
late_initcall(pasemi_idle_init);

static int __init idle_param(char *p)
{
Expand Down
2 changes: 0 additions & 2 deletions arch/powerpc/platforms/pasemi/pasemi.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ extern void __iomem *pasemi_pci_getcfgaddr(struct pci_dev *dev, int offset);

extern void __init alloc_iobmap_l2(void);

extern void __init pasemi_idle_init(void);

/* Power savings modes, implemented in asm */
extern void idle_spin(void);
extern void idle_doze(void);
Expand Down
2 changes: 0 additions & 2 deletions arch/powerpc/platforms/pasemi/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,6 @@ void __init pas_setup_arch(void)
/* Remap SDC register for doing reset */
/* XXXOJN This should maybe come out of the device tree */
reset_reg = ioremap(0xfc101100, 4);

pasemi_idle_init();
}

static int __init pas_setup_mce_regs(void)
Expand Down

0 comments on commit 3850169

Please sign in to comment.