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

Commit d40fce7e authored by Ulf Hansson's avatar Ulf Hansson Committed by Rafael J. Wysocki
Browse files

ARM: s3c64xx: Leave disabling of unused PM domains to genpd 



Since genpd at late init, will try to disable unused PM domains we
don't need to do it from the machine specific code as well.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Reviewed-by: default avatarKevin Hilman <khilman@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 0fcc4552

arch/arm/mach-s3c64xx/common.c

+0 −5
Original line number Diff line number Diff line
@@ -440,8 +440,3 @@ void s3c64xx_restart(enum reboot_mode mode, const char *cmd) 
	/* if all else fails, or mode was for soft, jump to 0 */

	soft_restart(0);

}
 


void __init s3c64xx_init_late(void)

{

	s3c64xx_pm_late_initcall();

}

arch/arm/mach-s3c64xx/common.h

+0 −7
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ void s3c64xx_init_irq(u32 vic0, u32 vic1); 
void s3c64xx_init_io(struct map_desc *mach_desc, int size);



void s3c64xx_restart(enum reboot_mode mode, const char *cmd);

void s3c64xx_init_late(void);



void s3c64xx_clk_init(struct device_node *np, unsigned long xtal_f,

	unsigned long xusbxti_f, bool is_s3c6400, void __iomem *reg_base);
@@ -52,12 +51,6 @@ extern void s3c6410_map_io(void); 
#define s3c6410_init NULL

#endif



#ifdef CONFIG_PM

int __init s3c64xx_pm_late_initcall(void);

#else

static inline int s3c64xx_pm_late_initcall(void) { return 0; }

#endif



#ifdef CONFIG_S3C64XX_PL080

extern struct pl08x_platform_data s3c64xx_dma0_plat_data;

extern struct pl08x_platform_data s3c64xx_dma1_plat_data;

arch/arm/mach-s3c64xx/mach-anw6410.c

+0 −1
Original line number Diff line number Diff line
@@ -233,7 +233,6 @@ MACHINE_START(ANW6410, "A&W6410") 
	.init_irq	= s3c6410_init_irq,

	.map_io		= anw6410_map_io,

	.init_machine	= anw6410_machine_init,

	.init_late	= s3c64xx_init_late,

	.init_time	= samsung_timer_init,

	.restart	= s3c64xx_restart,

MACHINE_END

arch/arm/mach-s3c64xx/mach-crag6410.c

+0 −1
Original line number Diff line number Diff line
@@ -857,7 +857,6 @@ MACHINE_START(WLF_CRAGG_6410, "Wolfson Cragganmore 6410") 
	.init_irq	= s3c6410_init_irq,

	.map_io		= crag6410_map_io,

	.init_machine	= crag6410_machine_init,

	.init_late	= s3c64xx_init_late,

	.init_time	= samsung_timer_init,

	.restart	= s3c64xx_restart,

MACHINE_END

arch/arm/mach-s3c64xx/mach-hmt.c

+0 −1
Original line number Diff line number Diff line
@@ -277,7 +277,6 @@ MACHINE_START(HMT, "Airgoo-HMT") 
	.init_irq	= s3c6410_init_irq,

	.map_io		= hmt_map_io,

	.init_machine	= hmt_machine_init,

	.init_late	= s3c64xx_init_late,

	.init_time	= samsung_timer_init,

	.restart	= s3c64xx_restart,

MACHINE_END