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

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
...@@ -440,8 +440,3 @@ void s3c64xx_restart(enum reboot_mode mode, const char *cmd) ...@@ -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 */ /* if all else fails, or mode was for soft, jump to 0 */
soft_restart(0); soft_restart(0);
} }
void __init s3c64xx_init_late(void)
{
s3c64xx_pm_late_initcall();
}
...@@ -23,7 +23,6 @@ void s3c64xx_init_irq(u32 vic0, u32 vic1); ...@@ -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_init_io(struct map_desc *mach_desc, int size);
void s3c64xx_restart(enum reboot_mode mode, const char *cmd); 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, void s3c64xx_clk_init(struct device_node *np, unsigned long xtal_f,
unsigned long xusbxti_f, bool is_s3c6400, void __iomem *reg_base); unsigned long xusbxti_f, bool is_s3c6400, void __iomem *reg_base);
...@@ -52,12 +51,6 @@ extern void s3c6410_map_io(void); ...@@ -52,12 +51,6 @@ extern void s3c6410_map_io(void);
#define s3c6410_init NULL #define s3c6410_init NULL
#endif #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 #ifdef CONFIG_S3C64XX_PL080
extern struct pl08x_platform_data s3c64xx_dma0_plat_data; extern struct pl08x_platform_data s3c64xx_dma0_plat_data;
extern struct pl08x_platform_data s3c64xx_dma1_plat_data; extern struct pl08x_platform_data s3c64xx_dma1_plat_data;
......
...@@ -233,7 +233,6 @@ MACHINE_START(ANW6410, "A&W6410") ...@@ -233,7 +233,6 @@ MACHINE_START(ANW6410, "A&W6410")
.init_irq = s3c6410_init_irq, .init_irq = s3c6410_init_irq,
.map_io = anw6410_map_io, .map_io = anw6410_map_io,
.init_machine = anw6410_machine_init, .init_machine = anw6410_machine_init,
.init_late = s3c64xx_init_late,
.init_time = samsung_timer_init, .init_time = samsung_timer_init,
.restart = s3c64xx_restart, .restart = s3c64xx_restart,
MACHINE_END MACHINE_END
...@@ -857,7 +857,6 @@ MACHINE_START(WLF_CRAGG_6410, "Wolfson Cragganmore 6410") ...@@ -857,7 +857,6 @@ MACHINE_START(WLF_CRAGG_6410, "Wolfson Cragganmore 6410")
.init_irq = s3c6410_init_irq, .init_irq = s3c6410_init_irq,
.map_io = crag6410_map_io, .map_io = crag6410_map_io,
.init_machine = crag6410_machine_init, .init_machine = crag6410_machine_init,
.init_late = s3c64xx_init_late,
.init_time = samsung_timer_init, .init_time = samsung_timer_init,
.restart = s3c64xx_restart, .restart = s3c64xx_restart,
MACHINE_END MACHINE_END
...@@ -277,7 +277,6 @@ MACHINE_START(HMT, "Airgoo-HMT") ...@@ -277,7 +277,6 @@ MACHINE_START(HMT, "Airgoo-HMT")
.init_irq = s3c6410_init_irq, .init_irq = s3c6410_init_irq,
.map_io = hmt_map_io, .map_io = hmt_map_io,
.init_machine = hmt_machine_init, .init_machine = hmt_machine_init,
.init_late = s3c64xx_init_late,
.init_time = samsung_timer_init, .init_time = samsung_timer_init,
.restart = s3c64xx_restart, .restart = s3c64xx_restart,
MACHINE_END MACHINE_END
...@@ -366,7 +366,6 @@ MACHINE_START(MINI6410, "MINI6410") ...@@ -366,7 +366,6 @@ MACHINE_START(MINI6410, "MINI6410")
.init_irq = s3c6410_init_irq, .init_irq = s3c6410_init_irq,
.map_io = mini6410_map_io, .map_io = mini6410_map_io,
.init_machine = mini6410_machine_init, .init_machine = mini6410_machine_init,
.init_late = s3c64xx_init_late,
.init_time = samsung_timer_init, .init_time = samsung_timer_init,
.restart = s3c64xx_restart, .restart = s3c64xx_restart,
MACHINE_END MACHINE_END
...@@ -103,7 +103,6 @@ MACHINE_START(NCP, "NCP") ...@@ -103,7 +103,6 @@ MACHINE_START(NCP, "NCP")
.init_irq = s3c6410_init_irq, .init_irq = s3c6410_init_irq,
.map_io = ncp_map_io, .map_io = ncp_map_io,
.init_machine = ncp_machine_init, .init_machine = ncp_machine_init,
.init_late = s3c64xx_init_late,
.init_time = samsung_timer_init, .init_time = samsung_timer_init,
.restart = s3c64xx_restart, .restart = s3c64xx_restart,
MACHINE_END MACHINE_END
...@@ -335,7 +335,6 @@ MACHINE_START(REAL6410, "REAL6410") ...@@ -335,7 +335,6 @@ MACHINE_START(REAL6410, "REAL6410")
.init_irq = s3c6410_init_irq, .init_irq = s3c6410_init_irq,
.map_io = real6410_map_io, .map_io = real6410_map_io,
.init_machine = real6410_machine_init, .init_machine = real6410_machine_init,
.init_late = s3c64xx_init_late,
.init_time = samsung_timer_init, .init_time = samsung_timer_init,
.restart = s3c64xx_restart, .restart = s3c64xx_restart,
MACHINE_END MACHINE_END
...@@ -156,7 +156,6 @@ MACHINE_START(SMARTQ5, "SmartQ 5") ...@@ -156,7 +156,6 @@ MACHINE_START(SMARTQ5, "SmartQ 5")
.init_irq = s3c6410_init_irq, .init_irq = s3c6410_init_irq,
.map_io = smartq_map_io, .map_io = smartq_map_io,
.init_machine = smartq5_machine_init, .init_machine = smartq5_machine_init,
.init_late = s3c64xx_init_late,
.init_time = samsung_timer_init, .init_time = samsung_timer_init,
.restart = s3c64xx_restart, .restart = s3c64xx_restart,
MACHINE_END MACHINE_END
...@@ -172,7 +172,6 @@ MACHINE_START(SMARTQ7, "SmartQ 7") ...@@ -172,7 +172,6 @@ MACHINE_START(SMARTQ7, "SmartQ 7")
.init_irq = s3c6410_init_irq, .init_irq = s3c6410_init_irq,
.map_io = smartq_map_io, .map_io = smartq_map_io,
.init_machine = smartq7_machine_init, .init_machine = smartq7_machine_init,
.init_late = s3c64xx_init_late,
.init_time = samsung_timer_init, .init_time = samsung_timer_init,
.restart = s3c64xx_restart, .restart = s3c64xx_restart,
MACHINE_END MACHINE_END
...@@ -92,7 +92,6 @@ MACHINE_START(SMDK6400, "SMDK6400") ...@@ -92,7 +92,6 @@ MACHINE_START(SMDK6400, "SMDK6400")
.init_irq = s3c6400_init_irq, .init_irq = s3c6400_init_irq,
.map_io = smdk6400_map_io, .map_io = smdk6400_map_io,
.init_machine = smdk6400_machine_init, .init_machine = smdk6400_machine_init,
.init_late = s3c64xx_init_late,
.init_time = samsung_timer_init, .init_time = samsung_timer_init,
.restart = s3c64xx_restart, .restart = s3c64xx_restart,
MACHINE_END MACHINE_END
...@@ -705,7 +705,6 @@ MACHINE_START(SMDK6410, "SMDK6410") ...@@ -705,7 +705,6 @@ MACHINE_START(SMDK6410, "SMDK6410")
.init_irq = s3c6410_init_irq, .init_irq = s3c6410_init_irq,
.map_io = smdk6410_map_io, .map_io = smdk6410_map_io,
.init_machine = smdk6410_machine_init, .init_machine = smdk6410_machine_init,
.init_late = s3c64xx_init_late,
.init_time = samsung_timer_init, .init_time = samsung_timer_init,
.restart = s3c64xx_restart, .restart = s3c64xx_restart,
MACHINE_END MACHINE_END
...@@ -347,10 +347,3 @@ static __init int s3c64xx_pm_initcall(void) ...@@ -347,10 +347,3 @@ static __init int s3c64xx_pm_initcall(void)
return 0; return 0;
} }
arch_initcall(s3c64xx_pm_initcall); arch_initcall(s3c64xx_pm_initcall);
int __init s3c64xx_pm_late_initcall(void)
{
pm_genpd_poweroff_unused();
return 0;
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment