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

Commit 4e59c25d authored by Ben Dooks's avatar Ben Dooks
Browse files

[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: default avatarBen Dooks <ben-linux@fluff.org>
parent 598ee002

Documentation/arm/Samsung-S3C24XX/Suspend.txt

+4 −4
Original line number Diff line number Diff line
@@ -40,13 +40,13 @@ Resuming 
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

  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.



  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);



	s3c2410_pm_init();

	s3c_pm_init();

}

arch/arm/mach-s3c2410/mach-h1940.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static void __init h1940_map_io(void) 
#ifdef CONFIG_PM_H1940

	memcpy(phys_to_virt(H1940_SUSPEND_RESUMEAT), h1940_pm_return, 1024);

#endif

	s3c2410_pm_init();

	s3c_pm_init();

}



static void __init h1940_init_irq(void)

arch/arm/mach-s3c2410/mach-qt2410.c

+1 −1
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ static void __init qt2410_machine_init(void) 
	s3c2410_gpio_cfgpin(S3C2410_GPB5, S3C2410_GPIO_OUTPUT);



	platform_add_devices(qt2410_devices, ARRAY_SIZE(qt2410_devices));

	s3c2410_pm_init();

	s3c_pm_init();

}



MACHINE_START(QT2410, "QT2410")

arch/arm/mach-s3c2412/mach-jive.c

+1 −1
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ static void __init jive_machine_init(void) 


	/* initialise the power management now we've setup everything. */



	s3c2410_pm_init();

	s3c_pm_init();



	s3c_device_nand.dev.platform_data = &jive_nand_info;

arch/arm/mach-s3c2440/mach-rx3715.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static void __init rx3715_init_machine(void) 
#ifdef CONFIG_PM_H1940

	memcpy(phys_to_virt(H1940_SUSPEND_RESUMEAT), h1940_pm_return, 1024);

#endif

	s3c2410_pm_init();

	s3c_pm_init();



	s3c24xx_fb_set_platdata(&rx3715_fb_info);

	platform_add_devices(rx3715_devices, ARRAY_SIZE(rx3715_devices));