mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 08:26:59 +00:00
[ARM] S3C: Rename s3c2410_pm_init to s3c_pm_init.
Since we have moved a large proportion of the PM code to the common support area, remove the cpu specific name from the initialisation function. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
This commit is contained in:
parent
598ee00207
commit
4e59c25dcb
9 changed files with 15 additions and 15 deletions
|
@ -40,13 +40,13 @@ Resuming
|
||||||
Machine Support
|
Machine Support
|
||||||
---------------
|
---------------
|
||||||
|
|
||||||
The machine specific functions must call the s3c2410_pm_init() function
|
The machine specific functions must call the s3c_pm_init() function
|
||||||
to say that its bootloader is capable of resuming. This can be as
|
to say that its bootloader is capable of resuming. This can be as
|
||||||
simple as adding the following to the machine's definition:
|
simple as adding the following to the machine's definition:
|
||||||
|
|
||||||
INITMACHINE(s3c2410_pm_init)
|
INITMACHINE(s3c_pm_init)
|
||||||
|
|
||||||
A board can do its own setup before calling s3c2410_pm_init, if it
|
A board can do its own setup before calling s3c_pm_init, if it
|
||||||
needs to setup anything else for power management support.
|
needs to setup anything else for power management support.
|
||||||
|
|
||||||
There is currently no support for over-riding the default method of
|
There is currently no support for over-riding the default method of
|
||||||
|
@ -74,7 +74,7 @@ statuc void __init machine_init(void)
|
||||||
|
|
||||||
enable_irq_wake(IRQ_EINT0);
|
enable_irq_wake(IRQ_EINT0);
|
||||||
|
|
||||||
s3c2410_pm_init();
|
s3c_pm_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -203,7 +203,7 @@ static void __init h1940_map_io(void)
|
||||||
#ifdef CONFIG_PM_H1940
|
#ifdef CONFIG_PM_H1940
|
||||||
memcpy(phys_to_virt(H1940_SUSPEND_RESUMEAT), h1940_pm_return, 1024);
|
memcpy(phys_to_virt(H1940_SUSPEND_RESUMEAT), h1940_pm_return, 1024);
|
||||||
#endif
|
#endif
|
||||||
s3c2410_pm_init();
|
s3c_pm_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __init h1940_init_irq(void)
|
static void __init h1940_init_irq(void)
|
||||||
|
|
|
@ -355,7 +355,7 @@ static void __init qt2410_machine_init(void)
|
||||||
s3c2410_gpio_cfgpin(S3C2410_GPB5, S3C2410_GPIO_OUTPUT);
|
s3c2410_gpio_cfgpin(S3C2410_GPB5, S3C2410_GPIO_OUTPUT);
|
||||||
|
|
||||||
platform_add_devices(qt2410_devices, ARRAY_SIZE(qt2410_devices));
|
platform_add_devices(qt2410_devices, ARRAY_SIZE(qt2410_devices));
|
||||||
s3c2410_pm_init();
|
s3c_pm_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
MACHINE_START(QT2410, "QT2410")
|
MACHINE_START(QT2410, "QT2410")
|
||||||
|
|
|
@ -630,7 +630,7 @@ static void __init jive_machine_init(void)
|
||||||
|
|
||||||
/* initialise the power management now we've setup everything. */
|
/* initialise the power management now we've setup everything. */
|
||||||
|
|
||||||
s3c2410_pm_init();
|
s3c_pm_init();
|
||||||
|
|
||||||
s3c_device_nand.dev.platform_data = &jive_nand_info;
|
s3c_device_nand.dev.platform_data = &jive_nand_info;
|
||||||
|
|
||||||
|
|
|
@ -203,7 +203,7 @@ static void __init rx3715_init_machine(void)
|
||||||
#ifdef CONFIG_PM_H1940
|
#ifdef CONFIG_PM_H1940
|
||||||
memcpy(phys_to_virt(H1940_SUSPEND_RESUMEAT), h1940_pm_return, 1024);
|
memcpy(phys_to_virt(H1940_SUSPEND_RESUMEAT), h1940_pm_return, 1024);
|
||||||
#endif
|
#endif
|
||||||
s3c2410_pm_init();
|
s3c_pm_init();
|
||||||
|
|
||||||
s3c24xx_fb_set_platdata(&rx3715_fb_info);
|
s3c24xx_fb_set_platdata(&rx3715_fb_info);
|
||||||
platform_add_devices(rx3715_devices, ARRAY_SIZE(rx3715_devices));
|
platform_add_devices(rx3715_devices, ARRAY_SIZE(rx3715_devices));
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
* published by the Free Software Foundation.
|
* published by the Free Software Foundation.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* s3c2410_pm_init
|
/* s3c_pm_init
|
||||||
*
|
*
|
||||||
* called from board at initialisation time to setup the power
|
* called from board at initialisation time to setup the power
|
||||||
* management
|
* management
|
||||||
|
@ -17,11 +17,11 @@
|
||||||
|
|
||||||
#ifdef CONFIG_PM
|
#ifdef CONFIG_PM
|
||||||
|
|
||||||
extern __init int s3c2410_pm_init(void);
|
extern __init int s3c_pm_init(void);
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
static inline int s3c2410_pm_init(void)
|
static inline int s3c_pm_init(void)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -316,14 +316,14 @@ static struct platform_suspend_ops s3c_pm_ops = {
|
||||||
.valid = suspend_valid_only_mem,
|
.valid = suspend_valid_only_mem,
|
||||||
};
|
};
|
||||||
|
|
||||||
/* s3c2410_pm_init
|
/* s3c_pm_init
|
||||||
*
|
*
|
||||||
* Attach the power management functions. This should be called
|
* Attach the power management functions. This should be called
|
||||||
* from the board specific initialisation if the board supports
|
* from the board specific initialisation if the board supports
|
||||||
* it.
|
* it.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
int __init s3c2410_pm_init(void)
|
int __init s3c_pm_init(void)
|
||||||
{
|
{
|
||||||
printk("S3C Power Management, Copyright 2004 Simtec Electronics\n");
|
printk("S3C Power Management, Copyright 2004 Simtec Electronics\n");
|
||||||
|
|
||||||
|
|
|
@ -201,5 +201,5 @@ void __init smdk_machine_init(void)
|
||||||
|
|
||||||
platform_add_devices(smdk_devs, ARRAY_SIZE(smdk_devs));
|
platform_add_devices(smdk_devs, ARRAY_SIZE(smdk_devs));
|
||||||
|
|
||||||
s3c2410_pm_init();
|
s3c_pm_init();
|
||||||
}
|
}
|
||||||
|
|
|
@ -61,7 +61,7 @@ static __init int pm_simtec_init(void)
|
||||||
|
|
||||||
__raw_writel(gstatus4, S3C2410_GSTATUS4);
|
__raw_writel(gstatus4, S3C2410_GSTATUS4);
|
||||||
|
|
||||||
return s3c2410_pm_init();
|
return s3c_pm_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
arch_initcall(pm_simtec_init);
|
arch_initcall(pm_simtec_init);
|
||||||
|
|
Loading…
Reference in a new issue