Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3850169d authored by Olof Johansson's avatar Olof Johansson Committed by Paul Mackerras
Browse files

[POWERPC] pasemi: Move pasemi_idle_init() to late_initcall() 



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: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent cd783416

arch/powerpc/platforms/pasemi/idle.c

+7 −1
Original line number Diff line number Diff line
@@ -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;
@@ -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)

{

arch/powerpc/platforms/pasemi/pasemi.h

+0 −2
Original line number Diff line number Diff line
@@ -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);

arch/powerpc/platforms/pasemi/setup.c

+0 −2
Original line number Diff line number Diff line
@@ -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)